← Back to branch summary

~mir-team/mir/trunk

~mir-team/mir/trunk

« back to all changes in this revision

Viewing changes to tests/unit-tests/client/test_client_mir_surface.cpp

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2013-04-25 23:50:01 UTC
mfrom: (526.2.22 mir1)
Revision ID: tarmac-20130425235001-c3b3x2yyb3eldyx1

frontend, shell, tests: surface-states updated to avoid supplying dependencies through public member functions.

Approved by PS Jenkins bot, Chris Halse Rogers, Robert Ancell, Kevin DuBois.

files added:
include/shared/mir/events

files removed:
tests/unit-tests/event

tests/unit-tests/event/CMakeLists.txt

files renamed:
include/shared/mir/event_sink.h => include/shared/mir/events/event_sink.h

src/server/event_queue.cpp => src/server/frontend/event_pipe.cpp

include/server/mir/event_queue.h => src/server/frontend/event_pipe.h

tests/unit-tests/event/test_event_queue.cpp => tests/unit-tests/frontend/test_event_pipe.cpp

files modified:
examples/demo-inprocess-egl/inprocess_egl_client.cpp

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/shell.h

include/server/mir/shell/application_session.h

include/server/mir/shell/organising_surface_factory.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_factory.h

include/server/mir/shell/surface_source.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell.h

src/client/make_rpc_channel.h

src/client/make_socket_rpc_channel.cpp

src/client/mir_basic_rpc_channel.cpp

src/client/mir_basic_rpc_channel.h

src/client/mir_client_library.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_socket_rpc_channel.cpp

src/client/mir_socket_rpc_channel.h

src/server/CMakeLists.txt

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/session_mediator.cpp

src/server/shell/application_session.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface.cpp

src/server/shell/surface_source.cpp

src/shared/protobuf/mir_protobuf_wire.proto

tests/acceptance-tests/test_focus_management_api.cpp

tests/behavior-tests/session_management_context.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

Show diffs side-by-side

added added

removed removed

tests/unit-tests/client/test_client_mir_surface.cpp

298

298

test_server.reset();

299

299

}

300

300

301

std::shared_ptr<google::protobuf::RpcChannel> channel;

301

std::shared_ptr<mcl::MirBasicRpcChannel> channel;

302

302

std::shared_ptr<mcl::Logger> logger;

303

303

std::shared_ptr<mcl::ClientPlatformFactory> platform_factory;

304

304

std::shared_ptr<MirConnection> connection;

Older »