Merge lp:~alan-griffiths/miral/fix-1658117 into lp:miral

[Alan Griffiths]

Tests (and correction) to shell chrome support

[Lukáš Tinkl (lukas-kde)]

LGTM, the shell chrome is set correctly when using with u8, tests passing locally

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-02-02 17:30:41 +0000
+++ debian/changelog	2017-02-08 17:19:02 +0000
@@ -19,6 +19,7 @@
       . top-level window is not raised along with its child (LP: #1658085)
       . miral-shell depends on default cursor theme being installed
         (LP: #1658159)
+      . Chrome-less shell hint does not work any more (LP: #1658117)
 
  -- Cemil Azizoglu <[e-mail]>  Fri, 27 Jan 2017 03:02:28 +0000
 

=== modified file 'include/miral/toolkit/window_spec.h'
--- include/miral/toolkit/window_spec.h	2017-02-03 12:10:41 +0000
+++ include/miral/toolkit/window_spec.h	2017-02-08 17:19:02 +0000
@@ -190,6 +190,16 @@
         return *this;
     }
 
+    auto set_shell_chrome(MirShellChrome chrome) -> WindowSpec&
+    {
+#if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)
+        mir_surface_spec_set_shell_chrome(*this, chrome);
+#else
+        mir_window_spec_set_shell_chrome(*this, chrome);
+#endif
+        return *this;
+    }
+
     auto set_min_size(int min_width, int min_height) -> WindowSpec&
     {
 #if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2017-02-02 17:18:42 +0000
+++ miral/basic_window_manager.cpp	2017-02-08 17:19:02 +0000
@@ -560,6 +560,7 @@
     COPY_IF_SET(preferred_orientation);
     COPY_IF_SET(confine_pointer);
     COPY_IF_SET(userdata);
+    COPY_IF_SET(shell_chrome);
 
 #undef COPY_IF_SET
 

=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2017-01-20 15:02:54 +0000
+++ test/CMakeLists.txt	2017-02-08 17:19:02 +0000
@@ -48,6 +48,7 @@
     window_placement.cpp
     window_placement_anchors_to_parent.cpp
     window_placement_client_api.cpp
+    window_properties.cpp
     drag_active_window.cpp
     modify_window_state.cpp
     test_server.cpp         test_server.h

=== added file 'test/window_properties.cpp'
--- test/window_properties.cpp	1970-01-01 00:00:00 +0000
+++ test/window_properties.cpp	2017-02-08 17:19:02 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2017 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 <miral/window_manager_tools.h>
+
+#include <miral/toolkit/window.h>
+#include <miral/toolkit/window_spec.h>
+#include <mir_toolkit/mir_buffer_stream.h>
+
+#include "test_server.h"
+
+#include <gmock/gmock.h>
+#include <mir/test/signal.h>
+
+
+using namespace testing;
+using namespace miral::toolkit;
+using namespace std::chrono_literals;
+using miral::WindowManagerTools;
+
+namespace
+{
+#if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)
+auto const mir_window_get_buffer_stream = mir_surface_get_buffer_stream;
+#endif
+
+std::string const a_window{"a window"};
+
+struct WindowProperties;
+
+struct WindowProperties : public miral::TestServer
+{
+    void SetUp() override
+    {
+        miral::TestServer::SetUp();
+        client_connection = connect_client("WindowProperties");
+    }
+
+    void TearDown() override
+    {
+        client_connection.reset();
+        miral::TestServer::TearDown();
+    }
+
+    Connection client_connection;
+};
+}
+
+TEST_F(WindowProperties, on_creation_default_shell_chrome_is_normal)
+{
+    auto const window = WindowSpec::for_normal_window(client_connection, 50, 50, mir_pixel_format_argb_8888)
+        .set_buffer_usage(mir_buffer_usage_software)
+        .set_name(a_window.c_str())
+        .create_window();
+
+    mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+
+    invoke_tools([&, this](WindowManagerTools& tools)
+    {
+        EXPECT_THAT(tools.info_for(tools.active_window()).shell_chrome(), Eq(mir_shell_chrome_normal));
+    });
+}
+
+TEST_F(WindowProperties, on_creation_client_setting_shell_chrome_low_is_seen_by_window_manager)
+{
+    auto const window = WindowSpec::for_normal_window(client_connection, 50, 50, mir_pixel_format_argb_8888)
+        .set_buffer_usage(mir_buffer_usage_software)
+        .set_name(a_window.c_str())
+        .set_shell_chrome(mir_shell_chrome_low)
+        .create_window();
+
+    mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+
+    invoke_tools([&, this](WindowManagerTools& tools)
+    {
+        EXPECT_THAT(tools.info_for(tools.active_window()).shell_chrome(), Eq(mir_shell_chrome_low));
+    });
+}
+
+TEST_F(WindowProperties, after_creation_client_setting_shell_chrome_low_is_seen_by_window_manager)
+{
+    auto const window = WindowSpec::for_normal_window(client_connection, 50, 50, mir_pixel_format_argb_8888)
+        .set_buffer_usage(mir_buffer_usage_software)
+        .set_name(a_window.c_str())
+        .create_window();
+
+    WindowSpec::for_changes(client_connection)
+        .set_shell_chrome(mir_shell_chrome_low)
+        .apply_to(window);
+
+    mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+
+    invoke_tools([&, this](WindowManagerTools& tools)
+    {
+        EXPECT_THAT(tools.info_for(tools.active_window()).shell_chrome(), Eq(mir_shell_chrome_low));
+    });
+}
+
+TEST_F(WindowProperties, after_creation_client_setting_shell_chrome_normal_is_seen_by_window_manager)
+{
+    auto const window = WindowSpec::for_normal_window(client_connection, 50, 50, mir_pixel_format_argb_8888)
+        .set_buffer_usage(mir_buffer_usage_software)
+        .set_name(a_window.c_str())
+        .set_shell_chrome(mir_shell_chrome_low)
+        .create_window();
+
+    WindowSpec::for_changes(client_connection)
+        .set_shell_chrome(mir_shell_chrome_normal)
+        .apply_to(window);
+
+    mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+
+    invoke_tools([&, this](WindowManagerTools& tools)
+    {
+        EXPECT_THAT(tools.info_for(tools.active_window()).shell_chrome(), Eq(mir_shell_chrome_normal));
+    });
+}