1
=== modified file 'tests/acceptance-tests/test_custom_input_dispatcher.cpp'
2
--- tests/acceptance-tests/test_custom_input_dispatcher.cpp	2014-05-09 09:56:45 +0000
3
+++ tests/acceptance-tests/test_custom_input_dispatcher.cpp	2014-05-12 12:20:04 +0000
4
@@ -23,6 +23,7 @@
5
23
23
6
24
#include "mir_test_framework/display_server_test_fixture.h"
24
#include "mir_test_framework/display_server_test_fixture.h"
7
25
#include "mir_test_framework/input_testing_server_configuration.h"
25
#include "mir_test_framework/input_testing_server_configuration.h"
8
26
#include "mir_test_framework/cross_process_sync.h"
9
26
#include "mir_test_doubles/mock_input_dispatcher.h"
27
#include "mir_test_doubles/mock_input_dispatcher.h"
10
27
#include "mir_test/fake_shared.h"
28
#include "mir_test/fake_shared.h"
11
28
#include "mir_test/fake_event_hub.h"
29
#include "mir_test/fake_event_hub.h"
12
@@ -108,7 +109,8 @@
13
108
                    using namespace ::testing;
109
                    using namespace ::testing;
14
109
                    InSequence seq;
110
                    InSequence seq;
15
110
                    EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::MotionEventWithPosition(1, 1))).Times(1);
111
                    EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::MotionEventWithPosition(1, 1))).Times(1);
17
111
                    EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::KeyDownEvent())).Times(1);
112
                    EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::KeyDownEvent()))
18
113
                        .WillOnce(InvokeWithoutArgs([this] { dispatching_done.signal_ready(); }));
19
112
                }
114
                }
20
113
115
21
114
                return dispatcher_conf;
116
                return dispatcher_conf;
22
@@ -119,9 +121,19 @@
23
119
            fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 1));
121
            fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 1));
24
120
            fake_event_hub->synthesize_event(mis::a_key_down_event().of_scancode(KEY_ENTER));
122
            fake_event_hub->synthesize_event(mis::a_key_down_event().of_scancode(KEY_ENTER));
25
121
        }
123
        }
26
124
27
125
        mtf::CrossProcessSync dispatching_done;
28
122
    } server_config;
126
    } server_config;
29
123
127
30
124
    launch_server_process(server_config);
128
    launch_server_process(server_config);
31
129
32
130
    // Since event handling happens asynchronously we need to allow some time
33
131
    // for it to take place before we leave the test. Otherwise, the server
34
132
    // may be stopped before events have been dispatched.
35
133
    run_in_test_process([&]
36
134
    {
37
135
        server_config.dispatching_done.wait_for_signal_ready_for(std::chrono::seconds{5});
38
136
    });
39
125
}
137
}
40
126
138
41
127
TEST_F(CustomInputDispatcherFixture, custom_input_dispatcher_gets_started_and_stopped)
139
TEST_F(CustomInputDispatcherFixture, custom_input_dispatcher_gets_started_and_stopped)
Reviewer	Review Type	Date Requested	Status
Alberto Aguirre (community)			Approve on 2014-05-13
Kevin DuBois (community)		2014-05-12	Approve on 2014-05-12
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-12
Review via email: mp+219180@code.launchpad.net