← Back to branch summary

~alan-griffiths/mir/knee-jerk-mir_surface_state_automatic

~alan-griffiths/mir/knee-jerk-mir_surface_state_automatic

« back to all changes in this revision

Viewing changes to tests/unit-tests/frontend/test_application_mediator.cpp

Committer: Alan Griffiths
Date: 2013-03-11 17:42:55 UTC
mfrom: (484 trunk)
mto: This revision was merged to the branch mainline in revision 494.
Revision ID: alan@octopull.co.uk-20130311174255-bjyo3a90v71entgq

Segregate server-only code

files added:
doc/building_source_for_pc.md

doc/installing_prebuilt_on_android.md

doc/installing_prebuilt_on_pc.md

doc/using_mir_on_android.md

doc/using_mir_on_pc.md

include/server

src/server

src/server/CMakeLists.txt

files renamed:
include/mir/ => include/server/mir/

include/mir/draw/ => include/shared/mir/draw/

src/compositor/ => src/server/compositor/

src/default_server_configuration.cpp => src/server/default_server_configuration.cpp

src/display_server.cpp => src/server/display_server.cpp

src/frontend/ => src/server/frontend/

src/graphics/ => src/server/graphics/

src/input/ => src/server/input/

src/logging/ => src/server/logging/

src/main.cpp => src/server/main.cpp

src/mirserver.pc.in => src/server/mirserver.pc.in

src/options/ => src/server/options/

src/shell/ => src/server/shell/

src/surfaces/ => src/server/surfaces/

src/draw/ => src/shared/draw/

files modified:
CMakeLists.txt

doc/mainpage.md

examples/CMakeLists.txt

include/test/mir_test/fake_event_hub_input_configuration.h

src/CMakeLists.txt

src/shared/CMakeLists.txt

tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

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

tests/integration-tests/graphics/gbm/test_buffer_integration.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/unit-tests/compositor/test_temporary_buffers.cpp

tests/unit-tests/frontend/test_application_mediator.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp

tests/unit-tests/graphics/android/test_android_buffer.cpp

tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_kms_output.cpp

tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp

tests/unit-tests/input/android/test_android_input_lexicon.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/input/android/test_android_input_reader_policy.cpp

tests/unit-tests/input/android/test_android_pointer_controller.cpp

tests/unit-tests/input/android/test_event_filter_chain.cpp

tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/surfaces/test_proxy_surface.cpp

Show diffs side-by-side

added added

removed removed

tests/unit-tests/frontend/test_application_mediator.cpp

32

32

#include "mir_test_doubles/null_buffer_bundle.h"

33

33

#include "mir_test_doubles/null_display.h"

34

34

35

#include "src/surfaces/proxy_surface.h"

35

#include "src/server/surfaces/proxy_surface.h"

36

36

37

37

#include <gtest/gtest.h>

38

38

#include <gmock/gmock.h>

Older »