← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/test_server_disconnect.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/test_server_disconnect.cpp
19
19
#include "mir_toolkit/mir_client_library.h"
20
20
 
21
21
#include "mir_test_framework/interprocess_client_server_test.h"
22
 
#include "mir_test_framework/cross_process_sync.h"
 
22
#include "mir_test/cross_process_sync.h"
23
23
#include "mir_test_framework/process.h"
 
24
#include "mir_test_framework/using_stub_client_platform.h"
24
25
#include "mir_test_framework/any_surface.h"
25
26
#include "mir_test/cross_process_action.h"
26
27
 
41
42
        mtf::InterprocessClientServerTest::SetUp();
42
43
        run_in_server([]{});
43
44
    }
 
45
 
 
46
    mtf::UsingStubClientPlatform using_stub_client_platform;
44
47
};
45
48
 
46
49
struct MockEventHandler
60
63
 
61
64
TEST_F(ServerDisconnect, is_detected_by_client)
62
65
{
63
 
    mtf::CrossProcessSync sync;
 
66
    mt::CrossProcessSync sync;
64
67
 
65
68
    auto const client = new_client_process([&]
66
69
        {
155
158
TEST_F(ServerDisconnect, causes_client_to_terminate_by_default)
156
159
{
157
160
    mt::CrossProcessAction connect;
158
 
    mtf::CrossProcessSync create_surface_sync;
 
161
    mt::CrossProcessSync create_surface_sync;
159
162
 
160
163
    auto const client = new_client_process([&]
161
164
        {