Mir

Merge lp:~alan-griffiths/mir/death-to-SurfaceConfigurator into lp:mir

  1. death-to-SurfaceConfigurator
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 2448
Proposed branch: lp:~alan-griffiths/mir/death-to-SurfaceConfigurator
Merge into: lp:mir
Diff against target: 462 lines (+9/-245)
14 files modified
playground/demo-shell/demo_shell.cpp (+1/-2)
src/include/server/mir/default_server_configuration.h (+0/-3)
src/include/server/mir/scene/surface_configurator.h (+0/-54)
src/include/server/mir/shell/default_window_manager.h (+2/-4)
src/server/default_server_configuration.cpp (+0/-20)
src/server/scene/surface_allocator.h (+0/-1)
src/server/shell/default_window_manager.cpp (+3/-12)
tests/include/mir_test_doubles/mock_surface_configurator.h (+0/-43)
tests/include/mir_test_doubles/null_surface_configurator.h (+0/-48)
tests/integration-tests/test_default_window_manager.cpp (+1/-51)
tests/integration-tests/test_surface_stack_with_compositor.cpp (+0/-1)
tests/mir_test_framework/fake_event_hub_server_configuration.cpp (+1/-2)
tests/unit-tests/scene/test_surface.cpp (+0/-1)
tests/unit-tests/shell/test_default_window_manager.cpp (+1/-3)
To merge this branch: bzr merge lp:~alan-griffiths/mir/death-to-SurfaceConfigurator
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Alexandros Frantzis (community) Approve
Review via email: mp+254796@code.launchpad.net

Commit message

scene: Remove the useless (and unused) SurfaceConfigurator customization point

Description of the change

scene: Remove the useless (and unused) SurfaceConfigurator customization point

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2445
http://jenkins.qa.ubuntu.com/job/mir-ci/3414/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1899
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1411
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1849
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4802
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19315

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

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Cool.

I implemented and almost proposed this a while back, but then found it was used downstream somewhere. Are all downstream users weaned off it yet?

review: Needs Information
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good. A quick grep shows a reference to the_surface_configurator in qtmir, but it's just a using declaration and the introduced name does not seem to be used, so it should be safe to just delete the declaration.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> Cool.
>
> I implemented and almost proposed this a while back, but then found it was
> used downstream somewhere. Are all downstream users weaned off it yet?

Nearly: https://code.launchpad.net/~mir-team/qtmir/compatibility-with-mir-API-changes/+merge/252589 line 161

Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1289/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1908/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1907/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1858/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/469/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1858/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'playground/demo-shell/demo_shell.cpp'
--- playground/demo-shell/demo_shell.cpp 2015-03-31 14:05:53 +0000
+++ playground/demo-shell/demo_shell.cpp 2015-04-01 10:12:47 +0000
@@ -107,8 +107,7 @@
107 { return std::make_shared<shell::DefaultWindowManager>(107 { return std::make_shared<shell::DefaultWindowManager>(
108 focus_controller,108 focus_controller,
109 the_placement_strategy(),109 the_placement_strategy(),
110 the_session_coordinator(),110 the_session_coordinator()); };
111 the_surface_configurator()); };
112 }111 }
113112
114 std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override113 std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
115114
=== modified file 'src/include/server/mir/default_server_configuration.h'
--- src/include/server/mir/default_server_configuration.h 2015-03-31 02:35:42 +0000
+++ src/include/server/mir/default_server_configuration.h 2015-04-01 10:12:47 +0000
@@ -104,7 +104,6 @@
104class SessionCoordinator;104class SessionCoordinator;
105class SnapshotStrategy;105class SnapshotStrategy;
106class SurfaceCoordinator;106class SurfaceCoordinator;
107class SurfaceConfigurator;
108class SurfaceStackModel;107class SurfaceStackModel;
109class SurfaceStack;108class SurfaceStack;
110class SceneReport;109class SceneReport;
@@ -283,7 +282,6 @@
283 virtual std::shared_ptr<scene::SurfaceStackModel> the_surface_stack_model();282 virtual std::shared_ptr<scene::SurfaceStackModel> the_surface_stack_model();
284 virtual std::shared_ptr<scene::SurfaceFactory> the_surface_factory();283 virtual std::shared_ptr<scene::SurfaceFactory> the_surface_factory();
285 virtual std::shared_ptr<scene::SurfaceCoordinator>the_surface_coordinator();284 virtual std::shared_ptr<scene::SurfaceCoordinator>the_surface_coordinator();
286 virtual std::shared_ptr<scene::SurfaceConfigurator> the_surface_configurator();
287 /** @} */285 /** @} */
288286
289 /** @name scene configuration - dependencies287 /** @name scene configuration - dependencies
@@ -424,7 +422,6 @@
424 CachedPtr<scene::PixelBuffer> pixel_buffer;422 CachedPtr<scene::PixelBuffer> pixel_buffer;
425 CachedPtr<scene::SnapshotStrategy> snapshot_strategy;423 CachedPtr<scene::SnapshotStrategy> snapshot_strategy;
426 CachedPtr<shell::DisplayLayout> shell_display_layout;424 CachedPtr<shell::DisplayLayout> shell_display_layout;
427 CachedPtr<scene::SurfaceConfigurator> surface_configurator;
428 CachedPtr<compositor::DisplayBufferCompositorFactory> display_buffer_compositor_factory;425 CachedPtr<compositor::DisplayBufferCompositorFactory> display_buffer_compositor_factory;
429 CachedPtr<compositor::Compositor> compositor;426 CachedPtr<compositor::Compositor> compositor;
430 CachedPtr<compositor::CompositorReport> compositor_report;427 CachedPtr<compositor::CompositorReport> compositor_report;
431428
=== removed file 'src/include/server/mir/scene/surface_configurator.h'
--- src/include/server/mir/scene/surface_configurator.h 2015-03-24 15:18:19 +0000
+++ src/include/server/mir/scene/surface_configurator.h 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
1/*
2 * Copyright © 2013 Canonical Ltd.
3 *
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License version 3,
6 * as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Authored by: Robert Carr <robert.carr@canonical.com>
17 */
18
19#ifndef MIR_SCENE_SURFACE_CONFIGURATOR_H_
20#define MIR_SCENE_SURFACE_CONFIGURATOR_H_
21
22#include "mir_toolkit/common.h"
23
24#include <memory>
25
26namespace mir
27{
28
29namespace scene
30{
31class Surface;
32
33class SurfaceConfigurator
34{
35public:
36 virtual ~SurfaceConfigurator() = default;
37
38 /// Returns the selected value.
39 virtual int select_attribute_value(Surface const& surface, MirSurfaceAttrib attrib,
40 int requested_value) = 0;
41
42 virtual void attribute_set(Surface const& surface, MirSurfaceAttrib attrib,
43 int new_value) = 0;
44
45protected:
46 SurfaceConfigurator() = default;
47 SurfaceConfigurator(SurfaceConfigurator const&) = delete;
48 SurfaceConfigurator& operator=(SurfaceConfigurator const&) = delete;
49};
50
51}
52} // namespace mir
53
54#endif // MIR_SCENE_SURFACE_CONFIGURATOR_H_
550
=== modified file 'src/include/server/mir/shell/default_window_manager.h'
--- src/include/server/mir/shell/default_window_manager.h 2015-03-31 11:18:41 +0000
+++ src/include/server/mir/shell/default_window_manager.h 2015-04-01 10:12:47 +0000
@@ -23,7 +23,7 @@
2323
24namespace mir24namespace mir
25{25{
26namespace scene { class PlacementStrategy; class SurfaceConfigurator; class SessionCoordinator; }26namespace scene { class PlacementStrategy; class SessionCoordinator; }
2727
28namespace shell28namespace shell
29{29{
@@ -34,8 +34,7 @@
34public:34public:
35 explicit DefaultWindowManager(FocusController* focus_controller,35 explicit DefaultWindowManager(FocusController* focus_controller,
36 std::shared_ptr<scene::PlacementStrategy> const& placement_strategy,36 std::shared_ptr<scene::PlacementStrategy> const& placement_strategy,
37 std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,37 std::shared_ptr<scene::SessionCoordinator> const& session_coordinator);
38 std::shared_ptr<scene::SurfaceConfigurator> const& surface_configurator);
3938
40 void add_session(std::shared_ptr<scene::Session> const& session) override;39 void add_session(std::shared_ptr<scene::Session> const& session) override;
4140
@@ -70,7 +69,6 @@
70 FocusController* const focus_controller;69 FocusController* const focus_controller;
71 std::shared_ptr<scene::PlacementStrategy> const placement_strategy;70 std::shared_ptr<scene::PlacementStrategy> const placement_strategy;
72 std::shared_ptr<scene::SessionCoordinator> const session_coordinator;71 std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
73 std::shared_ptr<scene::SurfaceConfigurator> const surface_configurator;
74};72};
75}73}
76}74}
7775
=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp 2015-01-21 07:34:50 +0000
+++ src/server/default_server_configuration.cpp 2015-04-01 10:12:47 +0000
@@ -29,7 +29,6 @@
29#include "mir/options/program_option.h"29#include "mir/options/program_option.h"
30#include "mir/frontend/session_credentials.h"30#include "mir/frontend/session_credentials.h"
31#include "mir/frontend/session_authorizer.h"31#include "mir/frontend/session_authorizer.h"
32#include "mir/scene/surface_configurator.h"
33#include "mir/graphics/cursor.h"32#include "mir/graphics/cursor.h"
34#include "mir/scene/null_session_listener.h"33#include "mir/scene/null_session_listener.h"
35#include "mir/graphics/display.h"34#include "mir/graphics/display.h"
@@ -101,25 +100,6 @@
101 });100 });
102}101}
103102
104std::shared_ptr<ms::SurfaceConfigurator> mir::DefaultServerConfiguration::the_surface_configurator()
105{
106 struct DefaultSurfaceConfigurator : public ms::SurfaceConfigurator
107 {
108 int select_attribute_value(ms::Surface const&, MirSurfaceAttrib, int requested_value)
109 {
110 return requested_value;
111 }
112 void attribute_set(ms::Surface const&, MirSurfaceAttrib, int)
113 {
114 }
115 };
116 return surface_configurator(
117 [this]()
118 {
119 return std::make_shared<DefaultSurfaceConfigurator>();
120 });
121}
122
123std::shared_ptr<mf::SessionAuthorizer>103std::shared_ptr<mf::SessionAuthorizer>
124mir::DefaultServerConfiguration::the_session_authorizer()104mir::DefaultServerConfiguration::the_session_authorizer()
125{105{
126106
=== modified file 'src/server/scene/surface_allocator.h'
--- src/server/scene/surface_allocator.h 2015-03-31 02:35:42 +0000
+++ src/server/scene/surface_allocator.h 2015-04-01 10:12:47 +0000
@@ -36,7 +36,6 @@
36{36{
37class BufferStreamFactory;37class BufferStreamFactory;
38class SceneReport;38class SceneReport;
39class SurfaceConfigurator;
4039
41class SurfaceAllocator : public SurfaceFactory40class SurfaceAllocator : public SurfaceFactory
42{41{
4342
=== modified file 'src/server/shell/default_window_manager.cpp'
--- src/server/shell/default_window_manager.cpp 2015-03-31 11:18:41 +0000
+++ src/server/shell/default_window_manager.cpp 2015-04-01 10:12:47 +0000
@@ -23,7 +23,6 @@
23#include "mir/scene/session.h"23#include "mir/scene/session.h"
24#include "mir/scene/session_coordinator.h"24#include "mir/scene/session_coordinator.h"
25#include "mir/scene/surface.h"25#include "mir/scene/surface.h"
26#include "mir/scene/surface_configurator.h"
27#include "mir/scene/surface_creation_parameters.h"26#include "mir/scene/surface_creation_parameters.h"
28#include "mir/shell/focus_controller.h"27#include "mir/shell/focus_controller.h"
2928
@@ -34,12 +33,10 @@
34msh::DefaultWindowManager::DefaultWindowManager(33msh::DefaultWindowManager::DefaultWindowManager(
35 FocusController* focus_controller,34 FocusController* focus_controller,
36 std::shared_ptr<scene::PlacementStrategy> const& placement_strategy,35 std::shared_ptr<scene::PlacementStrategy> const& placement_strategy,
37 std::shared_ptr<scene::SessionCoordinator> const& session_coordinator,36 std::shared_ptr<scene::SessionCoordinator> const& session_coordinator) :
38 std::shared_ptr<scene::SurfaceConfigurator> const& surface_configurator) :
39 focus_controller{focus_controller},37 focus_controller{focus_controller},
40 placement_strategy{placement_strategy},38 placement_strategy{placement_strategy},
41 session_coordinator{session_coordinator},39 session_coordinator{session_coordinator}
42 surface_configurator{surface_configurator}
43{40{
44}41}
4542
@@ -138,11 +135,5 @@
138 MirSurfaceAttrib attrib,135 MirSurfaceAttrib attrib,
139 int value)136 int value)
140{137{
141 auto const configured_value = surface_configurator->select_attribute_value(*surface, attrib, value);138 return surface->configure(attrib, value);
142
143 auto const result = surface->configure(attrib, configured_value);
144
145 surface_configurator->attribute_set(*surface, attrib, result);
146
147 return result;
148}139}
149140
=== removed file 'tests/include/mir_test_doubles/mock_surface_configurator.h'
--- tests/include/mir_test_doubles/mock_surface_configurator.h 2015-01-21 07:34:50 +0000
+++ tests/include/mir_test_doubles/mock_surface_configurator.h 1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
1/*
2 * Copyright © 2013 Canonical Ltd.
3 *
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License version 3,
6 * as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Authored by: Robert Carr <robert.carr@canonical.com>
17 */
18
19#ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_CONFIGURATOR_H_
20#define MIR_TEST_DOUBLES_MOCK_SURFACE_CONFIGURATOR_H_
21
22#include "mir/scene/surface_configurator.h"
23
24#include <gmock/gmock.h>
25
26namespace mir
27{
28namespace test
29{
30namespace doubles
31{
32
33struct MockSurfaceConfigurator : public scene::SurfaceConfigurator
34{
35 MOCK_METHOD3(select_attribute_value, int(scene::Surface const&, MirSurfaceAttrib, int));
36 MOCK_METHOD3(attribute_set, void(scene::Surface const&, MirSurfaceAttrib, int));
37};
38
39}
40}
41}
42
43#endif /* MIR_TEST_DOUBLES_MOCK_SURFACE_CONFIGURATOR_H_ */
440
=== removed file 'tests/include/mir_test_doubles/null_surface_configurator.h'
--- tests/include/mir_test_doubles/null_surface_configurator.h 2015-01-21 07:34:50 +0000
+++ tests/include/mir_test_doubles/null_surface_configurator.h 1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
1/*
2 * Copyright © 2013 Canonical Ltd.
3 *
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License version 3,
6 * as published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *
16 * Authored by: Robert Carr <robert.carr@canonical.com>
17 */
18
19#ifndef MIR_TEST_DOUBLES_NULL_SURFACE_CONFIGURATOR_H_
20#define MIR_TEST_DOUBLES_NULL_SURFACE_CONFIGURATOR_H_
21
22#include "mir/scene/surface_configurator.h"
23
24namespace mir
25{
26namespace test
27{
28namespace doubles
29{
30
31struct NullSurfaceConfigurator : public scene::SurfaceConfigurator
32{
33 int select_attribute_value(scene::Surface const&,
34 MirSurfaceAttrib, int requested_value)
35 {
36 return requested_value;
37 }
38 void attribute_set(scene::Surface const&,
39 MirSurfaceAttrib, int)
40 {
41 }
42};
43
44}
45}
46}
47
48#endif /* MIR_TEST_DOUBLES_NULL_SURFACE_CONFIGURATOR_H_ */
490
=== modified file 'tests/integration-tests/test_default_window_manager.cpp'
--- tests/integration-tests/test_default_window_manager.cpp 2015-03-31 11:18:41 +0000
+++ tests/integration-tests/test_default_window_manager.cpp 2015-04-01 10:12:47 +0000
@@ -33,7 +33,6 @@
33#include "mir_test_doubles/null_snapshot_strategy.h"33#include "mir_test_doubles/null_snapshot_strategy.h"
34#include "mir_test_doubles/null_event_sink.h"34#include "mir_test_doubles/null_event_sink.h"
35#include "mir_test_doubles/null_session_event_sink.h"35#include "mir_test_doubles/null_session_event_sink.h"
36#include "mir_test_doubles/mock_surface_configurator.h"
37#include "mir_test_doubles/null_prompt_session_manager.h"36#include "mir_test_doubles/null_prompt_session_manager.h"
38#include "mir_test_doubles/mock_input_targeter.h"37#include "mir_test_doubles/mock_input_targeter.h"
39#include "mir_test_doubles/stub_buffer_stream_factory.h"38#include "mir_test_doubles/stub_buffer_stream_factory.h"
@@ -82,8 +81,6 @@
82 mt::fake_shared(session_listener)81 mt::fake_shared(session_listener)
83 };82 };
8483
85 NiceMock<mtd::MockSurfaceConfigurator> surface_configurator;
86
87 msh::AbstractShell shell{84 msh::AbstractShell shell{
88 mt::fake_shared(input_targeter),85 mt::fake_shared(input_targeter),
89 mt::fake_shared(surface_coordinator),86 mt::fake_shared(surface_coordinator),
@@ -93,8 +90,7 @@
93 { return std::make_shared<msh::DefaultWindowManager>(90 { return std::make_shared<msh::DefaultWindowManager>(
94 focus_controller,91 focus_controller,
95 std::make_shared<NullPlacementStrategy>(),92 std::make_shared<NullPlacementStrategy>(),
96 mt::fake_shared(session_manager),93 mt::fake_shared(session_manager));
97 mt::fake_shared(surface_configurator));
98 }};94 }};
99};95};
100}96}
@@ -183,49 +179,3 @@
183179
184 shell.set_focus_to(mt::fake_shared(app), mock_surface);180 shell.set_focus_to(mt::fake_shared(app), mock_surface);
185}181}
186
187TEST_F(TestDefaultWindowManager, configurator_selects_attribute_values)
188{
189 mtd::StubSceneSession app;
190 auto const session = mt::fake_shared(app);
191 auto const surface = std::make_shared<NiceMock<mtd::MockSurface>>();
192 ON_CALL(*surface, configure(_, _)).WillByDefault(ReturnArg<1>());
193
194 InSequence seq;
195
196 EXPECT_CALL(surface_configurator, select_attribute_value(_, mir_surface_attrib_state, mir_surface_state_restored))
197 .WillOnce(Return(mir_surface_state_minimized));
198
199 EXPECT_CALL(*surface, configure(mir_surface_attrib_state, mir_surface_state_minimized));
200
201 EXPECT_CALL(surface_configurator, attribute_set(_, mir_surface_attrib_state, mir_surface_state_minimized));
202
203 EXPECT_THAT(
204 shell.set_surface_attribute(session, surface, mir_surface_attrib_state, mir_surface_state_restored),
205 Eq(mir_surface_state_minimized));
206}
207
208TEST_F(TestDefaultWindowManager, set_surface_attribute_returns_value_set_by_configurator)
209{
210 mtd::StubSceneSession app;
211 auto const session = mt::fake_shared(app);
212 auto const surface = std::make_shared<NiceMock<mtd::MockSurface>>();
213 ON_CALL(*surface, configure(_, _)).WillByDefault(ReturnArg<1>());
214
215 ON_CALL(surface_configurator, select_attribute_value(_, Not(mir_surface_attrib_focus), _))
216 .WillByDefault(ReturnArg<1>());
217
218 ON_CALL(surface_configurator, select_attribute_value(_, mir_surface_attrib_focus, mir_surface_focused))
219 .WillByDefault(Return(mir_surface_unfocused));
220
221 ON_CALL(surface_configurator, select_attribute_value(_, mir_surface_attrib_focus, Not(mir_surface_focused)))
222 .WillByDefault(Return(mir_surface_focused));
223
224 EXPECT_THAT(
225 shell.set_surface_attribute(session, surface, mir_surface_attrib_focus, mir_surface_focused),
226 Eq(mir_surface_unfocused));
227
228 EXPECT_THAT(
229 shell.set_surface_attribute(session, surface, mir_surface_attrib_focus, mir_surface_unfocused),
230 Eq(mir_surface_focused));
231}
232182
=== modified file 'tests/integration-tests/test_surface_stack_with_compositor.cpp'
--- tests/integration-tests/test_surface_stack_with_compositor.cpp 2015-03-31 02:35:42 +0000
+++ tests/integration-tests/test_surface_stack_with_compositor.cpp 2015-04-01 10:12:47 +0000
@@ -31,7 +31,6 @@
31#include "mir_test_doubles/stub_display_buffer.h"31#include "mir_test_doubles/stub_display_buffer.h"
32#include "mir_test_doubles/stub_buffer.h"32#include "mir_test_doubles/stub_buffer.h"
33#include "mir_test_doubles/stub_input_sender.h"33#include "mir_test_doubles/stub_input_sender.h"
34#include "mir_test_doubles/null_surface_configurator.h"
35#include "mir_test_doubles/null_display_sync_group.h"34#include "mir_test_doubles/null_display_sync_group.h"
3635
37#include <condition_variable>36#include <condition_variable>
3837
=== modified file 'tests/mir_test_framework/fake_event_hub_server_configuration.cpp'
--- tests/mir_test_framework/fake_event_hub_server_configuration.cpp 2015-03-31 11:18:41 +0000
+++ tests/mir_test_framework/fake_event_hub_server_configuration.cpp 2015-04-01 10:12:47 +0000
@@ -69,7 +69,6 @@
69 { return std::make_shared<ms::DefaultWindowManager>(69 { return std::make_shared<ms::DefaultWindowManager>(
70 focus_controller,70 focus_controller,
71 the_placement_strategy(),71 the_placement_strategy(),
72 the_session_coordinator(),72 the_session_coordinator()); };
73 the_surface_configurator()); };
74}73}
7574
7675
=== modified file 'tests/unit-tests/scene/test_surface.cpp'
--- tests/unit-tests/scene/test_surface.cpp 2015-03-31 02:35:42 +0000
+++ tests/unit-tests/scene/test_surface.cpp 2015-04-01 10:12:47 +0000
@@ -23,7 +23,6 @@
23#include "src/server/report/null_report_factory.h"23#include "src/server/report/null_report_factory.h"
24#include "mir/frontend/event_sink.h"24#include "mir/frontend/event_sink.h"
25#include "mir/scene/surface_creation_parameters.h"25#include "mir/scene/surface_creation_parameters.h"
26#include "mir/scene/surface_configurator.h"
27#include "mir/scene/surface_event_source.h"26#include "mir/scene/surface_event_source.h"
28#include "mir/input/input_channel.h"27#include "mir/input/input_channel.h"
2928
3029
=== modified file 'tests/unit-tests/shell/test_default_window_manager.cpp'
--- tests/unit-tests/shell/test_default_window_manager.cpp 2015-03-31 11:18:41 +0000
+++ tests/unit-tests/shell/test_default_window_manager.cpp 2015-04-01 10:12:47 +0000
@@ -34,7 +34,6 @@
34#include "mir_test_doubles/mock_session_listener.h"34#include "mir_test_doubles/mock_session_listener.h"
35#include "mir_test_doubles/mock_surface.h"35#include "mir_test_doubles/mock_surface.h"
36#include "mir_test_doubles/null_snapshot_strategy.h"36#include "mir_test_doubles/null_snapshot_strategy.h"
37#include "mir_test_doubles/null_surface_configurator.h"
38#include "mir_test_doubles/null_prompt_session_manager.h"37#include "mir_test_doubles/null_prompt_session_manager.h"
39#include "mir_test_doubles/stub_input_targeter.h"38#include "mir_test_doubles/stub_input_targeter.h"
40#include "mir_test_doubles/stub_buffer_stream_factory.h"39#include "mir_test_doubles/stub_buffer_stream_factory.h"
@@ -127,8 +126,7 @@
127 { return std::make_shared<msh::DefaultWindowManager>(126 { return std::make_shared<msh::DefaultWindowManager>(
128 focus_controller,127 focus_controller,
129 mt::fake_shared(placement_strategy),128 mt::fake_shared(placement_strategy),
130 mt::fake_shared(session_manager),129 mt::fake_shared(session_manager));
131 std::make_shared<mtd::NullSurfaceConfigurator>());
132 }};130 }};
133131
134 void SetUp() override132 void SetUp() override

Subscribers

People subscribed via source and target branches