~afrantzis/mir/expose-display-buffer-only-for-power-mode-on

Viewing changes to tests/unit-tests/scene/test_default_focus_mechanism.cpp

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2014-04-04 15:05:56 UTC
mfrom: (1526.2.16 mir)
Revision ID: tarmac-20140404150556-wlj2g9jama5yrvro

shell: Eliminate shell::SurfaceFactory and shell::Surface and use scene::SurfaceCoordinator and scene::Surface instead.

Approved by Andreas Pokorny, Gerry Boland, Alexandros Frantzis, PS Jenkins bot.

files removed:
include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/test/mir_test_doubles/mock_surface_factory.h

src/server/shell/organising_surface_factory.cpp

src/server/shell/organising_surface_factory.h

tests/unit-tests/shell/test_organising_surface_factory.cpp

files modified:
examples/demo-shell/window_manager.cpp

examples/render_surfaces.cpp

include/server/mir/default_server_configuration.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/shell/null_session_listener.h

include/server/mir/shell/session.h

include/server/mir/shell/session_listener.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_doubles/mock_shell_session.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_coordinator.h

include/test/mir_test_doubles/stub_shell_session.h

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_focus_mechanism.h

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_default_focus_mechanism.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/shell/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

tests/unit-tests/scene/test_default_focus_mechanism.cpp

#include "mir_test/fake_shared.h"

#include "mir_test_doubles/mock_buffer_stream.h"

#include "mir_test_doubles/mock_surface_factory.h"

#include "mir_test_doubles/mock_shell_session.h"

#include "mir_test_doubles/mock_surface.h"

#include "mir_test_doubles/mock_surface_coordinator.h"

EXPECT_CALL(app1, default_surface()).Times(1)

.WillOnce(Return(mt::fake_shared(mock_surface)));

EXPECT_CALL(app1, default_surface()).Times(1)

.WillOnce(Return(std::shared_ptr<msh::Surface>()));

.WillOnce(Return(std::shared_ptr<ms::Surface>()));

}

NiceMock<mtd::MockInputTargeter> targeter;

Older »