← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to tests/mir_test/display_config_matchers.cpp

  • Committer: Package Import Robot
  • Author(s): Alexandros Frantzis
  • Date: 2015-10-08 16:12:19 UTC
  • mto: This revision was merged to the branch mainline in revision 109.
  • Revision ID: package-import@ubuntu.com-20151008161219-emk4a1ys51yy0wjb
Tags: upstream-0.17.0+15.10.20151008.2
Import upstream version 0.17.0+15.10.20151008.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mir_test/display_config_matchers.cpp
69
69
                protobuf_output.current_mode(),
70
70
                static_cast<MirPixelFormat>(protobuf_output.current_format()),
71
71
                static_cast<MirPowerMode>(protobuf_output.power_mode()),
72
 
                static_cast<MirOrientation>(protobuf_output.orientation())
 
72
                static_cast<MirOrientation>(protobuf_output.orientation()),
 
73
                1.0f,
 
74
                mir_form_factor_monitor
73
75
            };
74
76
 
75
77
            /* Modes */
135
137
                client_output.current_mode,
136
138
                client_output.current_format,
137
139
                static_cast<MirPowerMode>(client_output.power_mode),
138
 
                static_cast<MirOrientation>(client_output.orientation)
 
140
                static_cast<MirOrientation>(client_output.orientation),
 
141
                1.0f,
 
142
                mir_form_factor_monitor
139
143
            };
140
144
 
141
145
            /* Modes */
278
282
    return compare_display_configurations(config1, display_config);
279
283
}
280
284
 
 
285
bool mt::compare_display_configurations(MirDisplayConfiguration const* client_config1,
 
286
                                        MirDisplayConfiguration const* client_config2)
 
287
{
 
288
    TestDisplayConfiguration config1{*client_config1};
 
289
    TestDisplayConfiguration config2{*client_config2};
 
290
    return compare_display_configurations(config1, config2);
 
291
}
 
292
 
281
293
bool mt::compare_display_configurations(MirDisplayConfiguration const& client_config,
282
294
                                        mp::DisplayConfiguration const& protobuf_config)
283
295
{
292
304
    TestDisplayConfiguration config2{*display_config2};
293
305
    return compare_display_configurations(display_config1, config2);
294
306
}
 
307
 
 
308
bool mt::compare_display_configurations(MirDisplayConfiguration const* display_config2,
 
309
                                        graphics::DisplayConfiguration const& display_config1)
 
310
{
 
311
    TestDisplayConfiguration config2{*display_config2};
 
312
    return compare_display_configurations(display_config1, config2);
 
313
}