Merge lp:~alan-griffiths/miral/fix-FTBFS-on-Xenial-with-Mir-0.27 into lp:miral

[Alan Griffiths]

Fix FTBFS with GMock 1.7 matchers (when compiling against Mir 0.27)

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

PASSED: Continuous integration, rev:574
https://mir-jenkins.ubuntu.com/job/miral-ci/59/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/92
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5016
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5005
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5005
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5005
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/96/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/96
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/96/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Compiles ok!

Nitpicking: EXPECT_THAT(cookie, Ne(nullptr)) could be EXPECT_NE(nullptr, cookie);
(Google also seems to want the expected value to be first)

review: Approve

[Alan Griffiths (alan-griffiths)]

> Compiles ok!
>
> Nitpicking: EXPECT_THAT(cookie, Ne(nullptr)) could be EXPECT_NE(nullptr,
> cookie);
> (Google also seems to want the expected value to be first)

I think "EXPECT_THAT(cookie, Ne(nullptr))" reads better than "EXPECT_NE(nullptr, cookie)"

[Gerry Boland (gerboland)]

Not worth arguing about :)

=== modified file 'test/drag_and_drop.cpp'
--- test/drag_and_drop.cpp	2017-07-17 14:50:30 +0000
+++ test/drag_and_drop.cpp	2017-07-31 14:11:51 +0000
@@ -579,71 +579,71 @@
 {
     auto const cookie = user_initiates_drag();
 
-    EXPECT_THAT(cookie, NotNull());
+    EXPECT_THAT(cookie, Ne(nullptr));
 }
 
 TEST_F(DragAndDrop, when_client_requests_drags_it_receives_handle)
 {
     auto const cookie = user_initiates_drag();
-    ASSERT_THAT(cookie, NotNull());
+    ASSERT_THAT(cookie, Ne(nullptr));
 
     auto const handle = client_requests_drag(cookie);
 
-    EXPECT_THAT(handle, NotNull());
+    EXPECT_THAT(handle, Ne(nullptr));
 }
 
 TEST_F(DragAndDrop, during_drag_when_user_moves_mouse_client_receives_handle)
 {
     auto const cookie = user_initiates_drag();
-    ASSERT_THAT(cookie, NotNull());
+    ASSERT_THAT(cookie, Ne(nullptr));
     auto const handle_from_request = client_requests_drag(cookie);
 
     auto const handle = handle_from_mouse_move();
 
-    EXPECT_THAT(handle, NotNull());
+    EXPECT_THAT(handle, Ne(nullptr));
     EXPECT_THAT(handle, BlobContentEq(handle_from_request));
 }
 
 TEST_F(DragAndDrop, when_drag_moves_from_window_leave_event_contains_handle)
 {
     auto const cookie = user_initiates_drag();
-    ASSERT_THAT(cookie, NotNull());
+    ASSERT_THAT(cookie, Ne(nullptr));
     auto const handle_from_request = client_requests_drag(cookie);
 
     auto const handle = handle_from_mouse_leave();
 
-    EXPECT_THAT(handle, NotNull());
+    EXPECT_THAT(handle, Ne(nullptr));
     EXPECT_THAT(handle, BlobContentEq(handle_from_request));
 }
 
 TEST_F(DragAndDrop, when_drag_enters_target_window_enter_event_contains_handle)
 {
     auto const cookie = user_initiates_drag();
-    ASSERT_THAT(cookie, NotNull());
+    ASSERT_THAT(cookie, Ne(nullptr));
     auto const handle_from_request = client_requests_drag(cookie);
 
     auto const handle = handle_from_mouse_enter();
 
-    EXPECT_THAT(handle, NotNull());
+    EXPECT_THAT(handle, Ne(nullptr));
     EXPECT_THAT(handle, BlobContentEq(handle_from_request));
 }
 
 TEST_F(DragAndDrop, when_drag_releases_target_window_release_event_contains_handle)
 {
     auto const cookie = user_initiates_drag();
-    ASSERT_THAT(cookie, NotNull());
+    ASSERT_THAT(cookie, Ne(nullptr));
     auto const handle_from_request = client_requests_drag(cookie);
 
     auto const handle = handle_from_mouse_release();
 
-    EXPECT_THAT(handle, NotNull());
+    EXPECT_THAT(handle, Ne(nullptr));
     EXPECT_THAT(handle, BlobContentEq(handle_from_request));
 }
 
 TEST_F(DragAndDrop, after_drag_finishes_pointer_events_no_longer_contain_handle)
 {
     auto const cookie = user_initiates_drag();
-    ASSERT_THAT(cookie, NotNull());
+    ASSERT_THAT(cookie, Ne(nullptr));
     client_requests_drag(cookie);
     handle_from_mouse_release();