← Back to branch summary

~unity-team/unity/7.1

« back to all changes in this revision

Viewing changes to tests/test_edge_barrier_controller.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_edge_barrier_controller.cpp
156
156
  bc.Subscribe(&handling_subscriber, monitor);
157
157
 
158
158
  MockPointerBarrier owner(monitor, true);
159
 
  auto breaking_barrier_event = MakeBarrierEvent(0, true);
 
159
  auto breaking_barrier_event = MakeBarrierEvent(5, true);
160
160
 
161
 
  EXPECT_CALL(owner, ReleaseBarrier(_)).Times(0);
 
161
  EXPECT_CALL(owner, ReleaseBarrier(5)).Times(1);
162
162
  bc.ProcessBarrierEvent(&owner, breaking_barrier_event);
163
163
}
164
164
 
239
239
  bc.ProcessBarrierEvent(&owner, MakeBarrierEvent(6, false));
240
240
}
241
241
 
242
 
TEST_F(TestEdgeBarrierController, BreakingEdgeDontReleasesBarrierForHandledEvents)
 
242
TEST_F(TestEdgeBarrierController, BreakingEdgeTemporaryReleasesBarrierForHandledEvents)
243
243
{
244
244
  MockPointerBarrier owner;
245
245
  int monitor = 0;
250
250
  ASSERT_TRUE(owner.released());
251
251
 
252
252
  subscribers_[monitor].handles_ = true;
253
 
  EXPECT_CALL(owner, ReleaseBarrier(_)).Times(0);
 
253
  EXPECT_CALL(owner, ReleaseBarrier(6)).Times(1);
254
254
  bc.ProcessBarrierEvent(&owner, MakeBarrierEvent(6, true));
255
255
}
256
256