← Back to branch summary

~robertcarr/mir/input-injector-api

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Kevin DuBois
  • Date: 2013-09-27 16:59:05 UTC
  • mfrom: (1050.2.25 fix-1220443)
  • Revision ID: tarmac-20130927165905-43fm344a9bfa3pmn
fix: lp:1220443

let the test framework to inject stub graphics platforms on the client side during acceptance and integration tests. Fixes: https://bugs.launchpad.net/bugs/1220443.

Approved by PS Jenkins bot, Alan Griffiths.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/test_surfaces_with_output_id.cpp
43
43
namespace mg = mir::graphics;
44
44
namespace mtd = mir::test::doubles;
45
45
 
46
 
// TODO resolve problems running tests on android
47
 
#ifdef ANDROID
48
 
#define DISABLED_ON_ANDROID(name) DISABLED_##name
49
 
#else
50
 
#define DISABLED_ON_ANDROID(name) name
51
 
#endif
52
 
 
53
46
namespace
54
47
{
55
48
char const* const mir_test_socket = mtf::test_socket_file().c_str();
128
121
 
129
122
using SurfacesWithOutputId = BespokeDisplayServerTestFixture;
130
123
 
131
 
TEST_F(SurfacesWithOutputId, DISABLED_ON_ANDROID(fullscreen_surfaces_are_placed_at_top_left_of_correct_output))
 
124
TEST_F(SurfacesWithOutputId, fullscreen_surfaces_are_placed_at_top_left_of_correct_output)
132
125
{
133
126
    mt::CrossProcessAction client_connect_and_create_surface;
134
127
    mt::CrossProcessAction client_release_surface_and_disconnect;
266
259
    });
267
260
}
268
261
 
269
 
TEST_F(SurfacesWithOutputId, DISABLED_ON_ANDROID(non_fullscreen_surfaces_are_not_accepted))
 
262
TEST_F(SurfacesWithOutputId, non_fullscreen_surfaces_are_not_accepted)
270
263
{
271
264
    mt::CrossProcessAction client_connect_and_create_surfaces;
272
265
    mt::CrossProcessAction client_disconnect;