1
=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
2
--- tests/acceptance-tests/test_client_surface_events.cpp	2014-06-19 16:15:42 +0000
3
+++ tests/acceptance-tests/test_client_surface_events.cpp	2014-06-30 11:17:53 +0000
4
@@ -100,6 +100,7 @@
5
100
    MirSurface* other_surface;
100
    MirSurface* other_surface;
6
101
101
7
102
    std::mutex last_event_mutex;
102
    std::mutex last_event_mutex;
8
103
    MirEventType event_filter{mir_event_type_surface};
9
103
    std::condition_variable last_event_cv;
104
    std::condition_variable last_event_cv;
10
104
    MirEvent last_event{};
105
    MirEvent last_event{};
11
105
    MirSurface* last_event_surface = nullptr;
106
    MirSurface* last_event_surface = nullptr;
12
@@ -111,16 +112,24 @@
13
111
    {
112
    {
14
112
        ClientSurfaceEvents* self = static_cast<ClientSurfaceEvents*>(ctx);
113
        ClientSurfaceEvents* self = static_cast<ClientSurfaceEvents*>(ctx);
15
113
        std::lock_guard<decltype(self->last_event_mutex)> last_event_lock{self->last_event_mutex};
114
        std::lock_guard<decltype(self->last_event_mutex)> last_event_lock{self->last_event_mutex};
16
115
        // Don't overwrite an interesting event with an uninteresting one!
17
116
        if (event->type != self->event_filter) return;
18
114
        self->last_event = *event;
117
        self->last_event = *event;
19
115
        self->last_event_surface = surface;
118
        self->last_event_surface = surface;
20
116
        self->last_event_cv.notify_one();
119
        self->last_event_cv.notify_one();
21
117
    }
120
    }
22
118
121
24
119
    bool wait_for_event(MirEventType type, std::chrono::milliseconds delay)
122
    bool wait_for_event(std::chrono::milliseconds delay)
25
120
    {
123
    {
26
121
        std::unique_lock<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
124
        std::unique_lock<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
27
122
        return last_event_cv.wait_for(last_event_lock, delay,
125
        return last_event_cv.wait_for(last_event_lock, delay,
29
123
            [&] { return !!last_event_surface && last_event.type == type; });
126
            [&] { return last_event_surface == surface && last_event.type == event_filter; });
30
127
    }
31
128
32
129
    void set_event_filter(MirEventType type)
33
130
    {
34
131
        std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
35
132
        event_filter = type;
36
124
    }
133
    }
37
125
134
38
126
    void reset_last_event()
135
    void reset_last_event()
39
@@ -218,11 +227,13 @@
40
218
227
41
219
TEST_P(OrientationEvents, surface_receives_orientation_events)
228
TEST_P(OrientationEvents, surface_receives_orientation_events)
42
220
{
229
{
43
230
    set_event_filter(mir_event_type_orientation);
44
231
45
221
    auto const direction = GetParam();
232
    auto const direction = GetParam();
46
222
233
47
223
    scene_surface->set_orientation(direction);
234
    scene_surface->set_orientation(direction);
48
224
235
50
225
    EXPECT_TRUE(wait_for_event(mir_event_type_orientation, std::chrono::seconds(1)));
236
    EXPECT_TRUE(wait_for_event(std::chrono::seconds(1)));
51
226
237
52
227
    std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
238
    std::lock_guard<decltype(last_event_mutex)> last_event_lock{last_event_mutex};
53
228
239
54
@@ -237,6 +248,8 @@
55
237
248
56
238
TEST_F(ClientSurfaceEvents, client_can_query_current_orientation)
249
TEST_F(ClientSurfaceEvents, client_can_query_current_orientation)
57
239
{
250
{
58
251
    set_event_filter(mir_event_type_orientation);
59
252
60
240
    for (auto const direction:
253
    for (auto const direction:
61
241
        {mir_orientation_normal, mir_orientation_left, mir_orientation_inverted,
254
        {mir_orientation_normal, mir_orientation_left, mir_orientation_inverted,
62
242
         mir_orientation_right, mir_orientation_normal, mir_orientation_inverted,
255
         mir_orientation_right, mir_orientation_normal, mir_orientation_inverted,
63
@@ -246,7 +259,7 @@
64
246
259
65
247
        scene_surface->set_orientation(direction);
260
        scene_surface->set_orientation(direction);
66
248
261
68
249
        EXPECT_TRUE(wait_for_event(mir_event_type_orientation, std::chrono::seconds(1)));
262
        EXPECT_TRUE(wait_for_event(std::chrono::seconds(1)));
69
250
263
70
251
        EXPECT_THAT(mir_surface_get_orientation(surface), Eq(direction));
264
        EXPECT_THAT(mir_surface_get_orientation(surface), Eq(direction));
71
252
    }
265
    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-01
Alberto Aguirre (community)			Approve on 2014-06-30
Alexandros Frantzis (community)		2014-06-30	Approve on 2014-06-30
Review via email: mp+224982@code.launchpad.net