← Back to branch summary

~kdub/+junk/direct

« back to all changes in this revision

Viewing changes to tests/unit-tests/test_lockable_callback.cpp

  • Committer: Kevin DuBois
  • Date: 2016-04-05 13:15:56 UTC
  • mfrom: (3359.35.30 development-branch)
  • Revision ID: kevin.dubois@canonical.com-20160405131556-asujsjoxqdkombmi
merge in mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/test_lockable_callback.cpp
33
33
{
34
34
    using namespace ::testing;
35
35
 
36
 
    mtd::MockLockableCallback mock_lockable_callback;
 
36
    auto mock_lockable_callback = new mtd::MockLockableCallback;
37
37
 
38
38
    bool pre_hook_called{false};
39
39
    bool post_hook_called{false};
40
40
 
41
41
    mir::LockableCallbackWrapper wrapper{
42
 
        mt::fake_shared(mock_lockable_callback),
 
42
        std::unique_ptr<mtd::MockLockableCallback>(mock_lockable_callback),
43
43
        [&pre_hook_called] {pre_hook_called = true;},
44
44
        [&post_hook_called] { post_hook_called = true; }};
45
45
 
46
 
    EXPECT_CALL(mock_lockable_callback, lock());
 
46
    EXPECT_CALL(*mock_lockable_callback, lock());
47
47
    wrapper.lock();
48
48
 
49
 
    EXPECT_CALL(mock_lockable_callback, unlock());
 
49
    EXPECT_CALL(*mock_lockable_callback, unlock());
50
50
    wrapper.unlock();
51
51
 
52
 
    EXPECT_CALL(mock_lockable_callback, functor());
 
52
    EXPECT_CALL(*mock_lockable_callback, functor());
53
53
    wrapper();
54
54
 
55
55
    EXPECT_THAT(pre_hook_called, Eq(true));