Merge lp:~alan-griffiths/mir/test-of-SkeletonWindowManager into lp:mir

[Alan Griffiths]

tests: Supply missing test suite for SkeletonWindowManager

tests: Supply missing test suite for SkeletonWindowManager

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2438
http://jenkins.qa.ubuntu.com/job/mir-ci/3398/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1868
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1867
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1395
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1818
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1818/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4772
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19238

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

okay

review: Approve

Unmerged revisions

2438. By Alan Griffiths on 2015-03-27

Avoid an explicit list of surface states

2437. By Alan Griffiths on 2015-03-27

SkeletonWindowManager.does_not_resize_on_state_changes

2436. By Alan Griffiths on 2015-03-27

merge lp:~alan-griffiths/mir/even-NullWindowManager-configures-surface

2435. By Alan Griffiths on 2015-03-27

SkeletonWindowManager.does_not_set_focus

2434. By Alan Griffiths on 2015-03-27

SkeletonWindowManager.ignores_output_selection

2433. By Alan Griffiths on 2015-03-27

merge lp:mir

2432. By Alan Griffiths on 2015-03-26

A few tests of SkeletonWindowManager

2431. By Alan Griffiths on 2015-03-26

merge lp:~alan-griffiths/mir/even-NullWindowManager-configures-surface

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2015-03-25 02:48:40 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2015-03-27 12:44:37 +0000
@@ -37,6 +37,7 @@
   test_client_platform_operation.cpp
   test_latency.cpp
   test_shell_control_of_surface_configuration.cpp
+  test_skeleton_window_manager.cpp
 )
 
 if (MIR_TEST_PLATFORM STREQUAL "mesa")

=== added file 'tests/acceptance-tests/test_skeleton_window_manager.cpp'
--- tests/acceptance-tests/test_skeleton_window_manager.cpp	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/test_skeleton_window_manager.cpp	2015-03-27 12:44:37 +0000
@@ -0,0 +1,217 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored By: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/shell/skeleton_window_manager.h"
+
+#include "mir/geometry/rectangle.h"
+
+#include "mir_test_framework/connected_client_with_a_surface.h"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <atomic>
+
+namespace msh = mir::shell;
+
+namespace mt = mir::test;
+
+using mir_test_framework::ConnectedClientWithASurface;
+using namespace mir::geometry;
+using namespace testing;
+
+namespace
+{
+std::vector<Rectangle> const display_geometry { {{0, 0},{1, 1}}, {{0, 1},{1, 2}} };
+
+struct EventCallback
+{
+    void operator()(MirSurface* surface, MirEvent const* event)
+    {
+        switch (mir_event_get_type(event))
+        {
+        case mir_event_type_surface:
+            surface_event(surface, mir_event_get_surface_event(event));
+            break;
+
+        case mir_event_type_resize:
+            resize_event(surface, mir_event_get_resize_event(event));
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    virtual ~EventCallback() = default;
+    virtual void surface_event(MirSurface* /*surface*/, MirSurfaceEvent const* /*event*/) {}
+    virtual void resize_event(MirSurface* /*surface*/, MirResizeEvent const* /*event*/) {}
+};
+
+void event_callback(MirSurface* surface, MirEvent const* event, void* context)
+{
+    (*static_cast<EventCallback*>(context))(surface, event);
+}
+
+MirSurfaceState operator++(MirSurfaceState& state)
+{
+    return state = static_cast<MirSurfaceState>(state+1);
+}
+
+struct SkeletonWindowManager : ConnectedClientWithASurface
+{
+    SkeletonWindowManager()
+    {
+        add_to_environment("MIR_SERVER_ENABLE_INPUT","off");
+        initial_display_layout(display_geometry);
+    }
+
+    void SetUp() override
+    {
+        server.override_the_window_manager_builder([](msh::FocusController*)
+            { return std::make_shared<msh::SkeletonWindowManager>(); });
+
+        ConnectedClientWithASurface::SetUp();
+    }
+};
+}
+
+TEST_F(SkeletonWindowManager, allows_surface_creation)
+{
+    EXPECT_TRUE(mir_surface_is_valid(surface));
+}
+
+TEST_F(SkeletonWindowManager, does_not_size_surface_to_display)
+{
+    MirSurfaceParameters params;
+    mir_surface_get_parameters(surface, &params);
+
+    EXPECT_THAT(params.width, Gt(2));
+    EXPECT_THAT(params.height, Gt(2));
+}
+
+TEST_F(SkeletonWindowManager, allows_all_states)
+{
+    for (auto state = mir_surface_state_unknown; state != mir_surface_states; ++state)
+    {
+        mir_wait_for(mir_surface_set_state(surface, state));
+
+        EXPECT_THAT(mir_surface_get_state(surface), Eq(state));
+    }
+}
+
+TEST_F(SkeletonWindowManager, does_not_resize_on_state_changes)
+{
+    struct ResizeEventCounter : EventCallback
+    {
+        std::atomic<unsigned> events{0};
+
+        void resize_event(MirSurface* /*surface*/, MirResizeEvent const* /*event*/) override
+        {
+            ++events;
+        }
+    } resize;
+
+    MirEventDelegate const event_delegate{event_callback, &resize};
+
+    mir_surface_set_event_handler(surface, &event_delegate);
+
+    for (auto state = mir_surface_state_unknown; state != mir_surface_states; ++state)
+    {
+        mir_wait_for(mir_surface_set_state(surface, state));
+    }
+
+    EXPECT_THAT(resize.events, Eq(0));
+}
+
+TEST_F(SkeletonWindowManager, ignores_output_selection)
+{
+    int const width = 13;
+    int const height= 17;
+
+    MirDisplayConfiguration* const config = mir_connection_create_display_config(connection);
+
+    MirDisplayOutput* const output = config->outputs + 0;
+
+    MirSurfaceSpec* const spec = mir_connection_create_spec_for_normal_surface(
+        connection,
+        width,
+        height,
+        mir_pixel_format_abgr_8888);
+
+    mir_surface_spec_set_fullscreen_on_output(spec, output->output_id);
+
+    MirSurface* const surface = mir_surface_create_sync(spec);
+    mir_surface_spec_release(spec);
+
+    MirSurfaceParameters params;
+    mir_surface_get_parameters(surface, &params);
+
+    MirDisplayMode* const mode = output->modes + output->current_mode;
+    EXPECT_THAT(params.width, Ne(mode->horizontal_resolution));
+    EXPECT_THAT(params.height, Ne(mode->vertical_resolution));
+
+    EXPECT_THAT(params.width, Eq(width));
+    EXPECT_THAT(params.height, Eq(height));
+
+    mir_surface_release_sync(surface);
+    mir_display_config_destroy(config);
+}
+
+TEST_F(SkeletonWindowManager, does_not_set_focus)
+{
+    int const width = 11;
+    int const height = 9;
+
+    struct FocusEventCounter : EventCallback
+    {
+        std::atomic<unsigned> events{0};
+
+        void surface_event(MirSurface* /*surface*/, MirSurfaceEvent const* event) override
+        {
+            if (mir_surface_event_get_attribute(event) == mir_surface_attrib_focus)
+                ++events;
+        }
+    } focus;
+
+    MirEventDelegate const event_delegate{event_callback, &focus};
+
+    mir_surface_set_event_handler(surface, &event_delegate);
+
+    MirSurface* surfaces[19] { nullptr };
+
+    for (MirSurface*& surface : surfaces)
+    {
+        MirSurfaceSpec* const spec = mir_connection_create_spec_for_normal_surface(
+            connection,
+            width,
+            height,
+            mir_pixel_format_abgr_8888);
+
+        surface = mir_surface_create_sync(spec);
+        mir_surface_spec_release(spec);
+        mir_surface_set_event_handler(surface, &event_delegate);
+    }
+
+    for (MirSurface* surface : surfaces)
+    {
+        mir_surface_release_sync(surface);
+    }
+
+    EXPECT_THAT(focus.events, Eq(0));
+}

=== modified file 'tests/include/mir_test_doubles/mock_display.h'
--- tests/include/mir_test_doubles/mock_display.h	2015-03-25 02:48:40 +0000
+++ tests/include/mir_test_doubles/mock_display.h	2015-03-27 12:44:37 +0000
@@ -20,6 +20,7 @@
 #define MIR_TEST_DOUBLES_MOCK_DISPLAY_H_
 
 #include "mir/graphics/display.h"
+#include "mir/graphics/display_configuration.h"
 #include "mir/graphics/gl_context.h"
 #include "mir/main_loop.h"
 #include "mir_test/gmock_fixes.h"