Merge lp:~brandontschaefer/mir/fix-confined-region-test into lp:mir

[Brandon Schaefer]

If we take *any* rectangles for our set region we can sometimes get the base set region of 0,0,100,100 of the window. We need to first expect 0,0,100,100 then we then expect our 0,0,200,100.
(LP: #1606418)

If we take *any* rectangles for our set region we can sometimes get the base set region of 0,0,100,100 of the window. We need to first expect 0,0,100,100 then we then expect our 0,0,200,100.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3901
https://mir-jenkins.ubuntu.com/job/mir-ci/2512/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3272/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3339
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3331
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3331
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3331
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3301/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3301/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3301/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3301/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3301/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3301/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2512/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3902
https://mir-jenkins.ubuntu.com/job/mir-ci/2524/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3285
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3352
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3344
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3344
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3344
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3314
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3314/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3314
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3314/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3314
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3314/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3314
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3314/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3314
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3314/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3314
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3314/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2524/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Sounds vaguely sensible. You don't have to fix a race if your algorithm can instead just expect and support the racing (which was my intent with resizing from the beginning).

review: Approve

=== modified file 'include/test/mir/test/event_matchers.h'
--- include/test/mir/test/event_matchers.h	2016-12-09 02:54:31 +0000
+++ include/test/mir/test/event_matchers.h	2017-01-05 00:29:40 +0000
@@ -586,6 +586,11 @@
         y == mir_input_device_state_event_pointer_axis(device_state, mir_pointer_axis_y);
 }
 
+MATCHER_P(RectanglesMatches, rectangles, "")
+{
+    return arg == rectangles;
+}
+
 }
 }
 

=== modified file 'tests/acceptance-tests/test_confined_pointer.cpp'
--- tests/acceptance-tests/test_confined_pointer.cpp	2016-12-09 02:54:31 +0000
+++ tests/acceptance-tests/test_confined_pointer.cpp	2017-01-05 00:29:40 +0000
@@ -248,26 +248,32 @@
 TEST_F(PointerConfinement, test_we_update_our_confined_region_on_a_resize)
 {
     positions[first] = geom::Rectangle{{0,0}, {surface_width, surface_height}};
+
+    geom::Rectangles main_region{{positions[first]}};
+    EXPECT_CALL(*mock_seat_observer, seat_set_confinement_region_called(mt::RectanglesMatches(main_region)))
+        .Times(1);
+
     Client client(new_connection(), first);
 
     auto fake = mt::fake_shared(surface_observer);
     latest_shell_surface()->add_observer(fake);
 
-    geom::Size new_size = {surface_width + 100, surface_height};
+    geom::Size new_size = {surface_width * 2, surface_height};
     EXPECT_CALL(surface_observer, resized_to(new_size)).Times(1);
 
-    EXPECT_CALL(*mock_seat_observer, seat_set_confinement_region_called(_)).
-            WillRepeatedly(InvokeWithoutArgs([&] { change_observed(); }));
+    geom::Rectangles confinement_region{{{0, 0}, new_size}};
+    EXPECT_CALL(*mock_seat_observer, seat_set_confinement_region_called(mt::RectanglesMatches(confinement_region)))
+        .WillRepeatedly(InvokeWithoutArgs([&] { change_observed(); }));
 
-    client.resize(surface_width + 100, surface_height);
+    client.resize(surface_width * 2, surface_height);
     resized_signaled.wait_for(1s);
 
     InSequence seq;
-    EXPECT_CALL(client, handle_input(mt::PointerEnterEventWithPosition(surface_width + 100 - 1, 0)));
-    EXPECT_CALL(client, handle_input(AllOf(mt::PointerEventWithPosition(surface_width + 100 - 1, 0), mt::PointerEventWithDiff(10, 0))))
+    EXPECT_CALL(client, handle_input(mt::PointerEnterEventWithPosition(surface_width * 2 - 1, 0)));
+    EXPECT_CALL(client, handle_input(AllOf(mt::PointerEventWithPosition(surface_width * 2 - 1, 0), mt::PointerEventWithDiff(10, 0))))
         .WillOnce(mt::WakeUp(&client.all_events_received));
 
-    fake_mouse->emit_event(mis::a_pointer_event().with_movement(surface_width + 101, 0));
+    fake_mouse->emit_event(mis::a_pointer_event().with_movement(surface_width * 2 + 1, 0));
     fake_mouse->emit_event(mis::a_pointer_event().with_movement(10, 0));
 
     client.all_events_received.wait_for(10s);