← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to tests/unit-tests/input/android/test_android_input_target_enumerator.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-10-10 14:01:26 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20141010140126-n1czko8na1kuz4ll
Tags: upstream-0.8.0+14.10.20141010
Import upstream version 0.8.0+14.10.20141010

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/input/android/test_android_input_target_enumerator.cpp
19
19
#include "src/server/input/android/android_input_target_enumerator.h"
20
20
 
21
21
#include "mir/input/input_channel.h"
22
 
#include "mir/input/input_targets.h"
 
22
#include "mir/input/scene.h"
23
23
#include "mir/input/surface.h"
24
24
 
25
25
#include "mir_test/fake_shared.h"
26
26
#include "mir_test_doubles/stub_input_channel.h"
27
27
#include "mir_test_doubles/stub_input_handles.h"
28
28
#include "mir_test_doubles/stub_input_surface.h"
 
29
#include "mir_test_doubles/stub_input_scene.h"
29
30
#include "mir_test_doubles/mock_window_handle_repository.h"
30
31
 
31
32
#include <InputDispatcher.h>
48
49
namespace
49
50
{
50
51
 
51
 
struct StubInputTargets : public mi::InputTargets
 
52
struct StubScene : public mtd::StubInputScene
52
53
{
53
 
    StubInputTargets(std::initializer_list<std::shared_ptr<mi::Surface>> const& target_list)
 
54
    StubScene(std::initializer_list<std::shared_ptr<mi::Surface>> const& target_list)
54
55
        : targets(target_list.begin(), target_list.end())
55
56
    {
56
57
    }
85
86
    mtd::MockWindowHandleRepository repository;
86
87
    droidinput::sp<droidinput::InputWindowHandle> stub_window_handle1 = new mtd::StubWindowHandle;
87
88
    droidinput::sp<droidinput::InputWindowHandle> stub_window_handle2 = new mtd::StubWindowHandle;
88
 
    StubInputTargets targets({target1, target2});
 
89
    StubScene targets({target1, target2});
89
90
 
90
91
    Sequence seq2;
91
92
    EXPECT_CALL(repository, handle_for_channel(