Merge lp:~alan-griffiths/mir/second-test-for-cursors-in-nested into lp:mir

[Alan Griffiths]

test: add a test for clients of nested servers setting the cursor image

test: add a test for clients of nested servers setting the cursor image

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2986
http://jenkins.qa.ubuntu.com/job/mir-ci/5097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4223
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/123/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/123/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4166
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4166/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6841/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23849
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/124/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5097/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2988
http://jenkins.qa.ubuntu.com/job/mir-ci/5101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4227
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4170
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4170/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6844/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23856
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/128/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5101/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2989
http://jenkins.qa.ubuntu.com/job/mir-ci/5103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4229
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3136/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1257/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4172
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4172/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6846/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23861
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/130/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5103/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Mmm. No cursors on mako?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2990
http://jenkins.qa.ubuntu.com/job/mir-ci/5114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4243
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3150/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4185
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/143/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4186
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6859
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23892
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/144/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5114/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK, so the wily builder prodstack-worker-med-0 doesn't have X cursors either.

I need a new plan.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2991
http://jenkins.qa.ubuntu.com/job/mir-ci/5116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4246
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1270/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/146/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4189
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4189/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6862/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23897
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/147/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5116/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2993
http://jenkins.qa.ubuntu.com/job/mir-ci/5117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4248
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4190
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/148/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1271
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1271/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/148/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4191
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6864
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23902
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/149/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5117/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

[ 69%] Building CXX object tests/integration-tests/CMakeFiles/mir_integration_tests.dir/test_focus_selection.cpp.o
/mir/tests/acceptance-tests/test_nested_mir.cpp:560:14: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
        data{uint8_t(id)}

Rats! I want to be able to just run clang builds without hacking a vivid environment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2995
http://jenkins.qa.ubuntu.com/job/mir-ci/5140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4216
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/174/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1294
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1294/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/174/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4217
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6882
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23940
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/175/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5140/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Daniel van Vugt (vanvugt)]

Cool.

review: Approve

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2015-10-05 09:07:11 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2015-10-05 09:07:12 +0000
@@ -19,6 +19,7 @@
 #include "mir/frontend/session_mediator_report.h"
 #include "mir/graphics/platform.h"
 #include "mir/graphics/cursor_image.h"
+#include "mir/input/cursor_images.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_configuration.h"
 #include "mir/graphics/display_configuration_report.h"
@@ -480,11 +481,10 @@
     mir_connection_release(connection);
 }
 
-TEST_F(NestedServer, cursor_image_changes_are_forwarded_to_host)
+TEST_F(NestedServer, animated_cursor_image_changes_are_forwarded_to_host)
 {
     int const frames = 10;
     NestedMirRunner nested_mir{new_connection()};
-    ignore_rebuild_of_egl_context();
 
     auto const connection = mir_connect_sync(nested_mir.new_connection().c_str(), __PRETTY_FUNCTION__);
     auto const surface = make_and_paint_surface(connection);
@@ -531,3 +531,103 @@
     mir_surface_release_sync(surface);
     mir_connection_release(connection);
 }
+
+// We can't rely on the test environment to have X cursors, so we provide some of our own
+namespace 
+{
+static auto const cursor_names = {
+//        mir_disabled_cursor_name,
+    mir_arrow_cursor_name,
+    mir_busy_cursor_name,
+    mir_caret_cursor_name,
+    mir_default_cursor_name,
+    mir_pointing_hand_cursor_name,
+    mir_open_hand_cursor_name,
+    mir_closed_hand_cursor_name,
+    mir_horizontal_resize_cursor_name,
+    mir_vertical_resize_cursor_name,
+    mir_diagonal_resize_bottom_to_top_cursor_name,
+    mir_diagonal_resize_top_to_bottom_cursor_name,
+    mir_omnidirectional_resize_cursor_name,
+    mir_vsplit_resize_cursor_name,
+    mir_hsplit_resize_cursor_name,
+    mir_crosshair_cursor_name };
+
+struct CursorImage : public mg::CursorImage
+{
+    CursorImage(char const* name) :
+        id{std::find(begin(cursor_names), end(cursor_names), name) - begin(cursor_names)},
+        data{{uint8_t(id)}}
+    {
+    }
+
+    void const* as_argb_8888() const { return data.data(); }
+
+    geom::Size size() const { return { 24, 24 }; }
+
+    geom::Displacement hotspot() const { return {0, 0}; }
+
+    ptrdiff_t id;
+    std::array<uint8_t, 4*8*24*24> data;
+};
+
+struct CursorImages : mir::input::CursorImages
+{
+public:
+
+    std::shared_ptr<mg::CursorImage> image(std::string const& cursor_name, geom::Size const& /*size*/)
+    {
+        return std::make_shared<CursorImage>(cursor_name.c_str());
+    }
+};
+
+class NestedMirRunnerWithCursorImages : public mtf::HeadlessNestedServerRunner
+{
+public:
+    NestedMirRunnerWithCursorImages(std::string const& connection_string)
+        : mtf::HeadlessNestedServerRunner(connection_string)
+    {
+        server.override_the_cursor_images([] { return std::make_shared<CursorImages>(); });
+        start_server();
+    }
+
+    ~NestedMirRunnerWithCursorImages()
+    {
+        stop_server();
+    }
+};
+}
+
+TEST_F(NestedServer, named_cursor_image_changes_are_forwarded_to_host)
+{
+    NestedMirRunnerWithCursorImages nested_mir{new_connection()};
+
+    auto const connection = mir_connect_sync(nested_mir.new_connection().c_str(), __PRETTY_FUNCTION__);
+    auto const surface = make_and_paint_surface(connection);
+    auto const mock_cursor = the_mock_cursor();
+
+    auto const spec = mir_connection_create_spec_for_changes(connection);
+    mir_surface_spec_set_fullscreen_on_output(spec, 1);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
+
+    server.the_cursor_listener()->cursor_moved_to(489, 9);
+
+    for (auto const name : cursor_names)
+    {
+        mt::WaitCondition condition;
+
+        EXPECT_CALL(*mock_cursor, show(_)).Times(1)
+            .WillOnce(InvokeWithoutArgs([&] { condition.wake_up_everyone(); }));
+
+        auto const cursor = mir_cursor_configuration_from_name(name);
+        mir_wait_for(mir_surface_configure_cursor(surface, cursor));
+        mir_cursor_configuration_destroy(cursor);
+
+        condition.wait_for_at_most_seconds(1);
+        Mock::VerifyAndClearExpectations(mock_cursor.get());
+    }
+
+    mir_surface_release_sync(surface);
+    mir_connection_release(connection);
+}