Mir

Merge lp:~afrantzis/mir/fix-1519276-android-display-tests into lp:mir

  1. fix-1519276-android-display-tests
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: 3122
Proposed branch: lp:~afrantzis/mir/fix-1519276-android-display-tests
Merge into: lp:mir
Diff against target: 188 lines (+28/-20)
2 files modified
include/test/mir/test/doubles/stub_display_configuration.h (+2/-2)
tests/unit-tests/graphics/android/test_display.cpp (+26/-18)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-1519276-android-display-tests
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andreas Pokorny (community) Approve
Alan Griffiths Approve
Review via email: mp+278420@code.launchpad.net

Commit message

tests: Update Android platform display tests to use the correct output ids

Description of the change

tests: Update Android platform display tests to use the correct output ids

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

ok..

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3122
http://jenkins.qa.ubuntu.com/job/mir-ci/5648/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5009
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3915
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4955/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/911/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1801
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/909
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4955
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4955/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7502/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25449
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/912/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5648/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/test/mir/test/doubles/stub_display_configuration.h'
2--- include/test/mir/test/doubles/stub_display_configuration.h 2015-11-09 10:03:56 +0000
3+++ include/test/mir/test/doubles/stub_display_configuration.h 2015-11-24 09:46:48 +0000
4@@ -37,7 +37,7 @@
5 {
6 StubDisplayConfigurationOutput(
7 geometry::Size px_size, geometry::Size mm_size, MirPixelFormat format, double vrefresh, bool connected) :
8- StubDisplayConfigurationOutput(graphics::DisplayConfigurationOutputId{0}, px_size, mm_size, format, vrefresh, connected)
9+ StubDisplayConfigurationOutput(graphics::DisplayConfigurationOutputId{1}, px_size, mm_size, format, vrefresh, connected)
10 {
11 }
12
13@@ -109,7 +109,7 @@
14 outputs[i].connected = connected_used[i].first;
15 outputs[i].used = connected_used[i].second;
16 outputs[i].current_format = mir_pixel_format_abgr_8888;
17- outputs[i].id = graphics::DisplayConfigurationOutputId{static_cast<int>(i)};
18+ outputs[i].id = graphics::DisplayConfigurationOutputId{static_cast<int>(i+1)};
19 }
20 }
21
22
23=== modified file 'tests/unit-tests/graphics/android/test_display.cpp'
24--- tests/unit-tests/graphics/android/test_display.cpp 2015-10-07 15:32:10 +0000
25+++ tests/unit-tests/graphics/android/test_display.cpp 2015-11-24 09:46:48 +0000
26@@ -46,6 +46,14 @@
27 namespace mtd=mir::test::doubles;
28 namespace geom=mir::geometry;
29
30+namespace
31+{
32+mg::DisplayConfigurationOutputId const primary_output_id{
33+ mga::as_output_id(mga::DisplayName::primary)};
34+mg::DisplayConfigurationOutputId const external_output_id{
35+ mga::as_output_id(mga::DisplayName::external)};
36+}
37+
38 class Display : public ::testing::Test
39 {
40 public:
41@@ -359,35 +367,35 @@
42 auto configuration = display.configuration();
43 configuration->for_each_output([&](mg::UserDisplayConfigurationOutput& output) {
44 //on by default
45- if (output.id == mg::DisplayConfigurationOutputId{0})
46+ if (output.id == primary_output_id)
47 EXPECT_EQ(output.power_mode, mir_power_mode_on);
48 output.power_mode = mir_power_mode_on;
49 });
50 display.configure(*configuration);
51
52 configuration->for_each_output([&](mg::UserDisplayConfigurationOutput& output) {
53- if (output.id == mg::DisplayConfigurationOutputId{0})
54+ if (output.id == primary_output_id)
55 EXPECT_EQ(output.power_mode, mir_power_mode_on);
56 output.power_mode = mir_power_mode_standby;
57 });
58 display.configure(*configuration);
59
60 configuration->for_each_output([&](mg::UserDisplayConfigurationOutput& output) {
61- if (output.id == mg::DisplayConfigurationOutputId{0})
62+ if (output.id == primary_output_id)
63 EXPECT_EQ(output.power_mode, mir_power_mode_standby);
64 output.power_mode = mir_power_mode_off;
65 });
66 display.configure(*configuration);
67
68 configuration->for_each_output([&](mg::UserDisplayConfigurationOutput& output) {
69- if (output.id == mg::DisplayConfigurationOutputId{0})
70+ if (output.id == primary_output_id)
71 EXPECT_EQ(output.power_mode, mir_power_mode_off);
72 output.power_mode = mir_power_mode_suspend;
73 });
74 display.configure(*configuration);
75
76 configuration->for_each_output([&](mg::UserDisplayConfigurationOutput& output) {
77- if (output.id == mg::DisplayConfigurationOutputId{0})
78+ if (output.id == primary_output_id)
79 EXPECT_EQ(output.power_mode, mir_power_mode_suspend);
80 });
81 }
82@@ -429,7 +437,7 @@
83 auto& disp_mode = outputs[0].modes[0];
84 EXPECT_EQ(pixel_size, disp_mode.size);
85 EXPECT_EQ(vrefresh, disp_mode.vrefresh_hz);
86- EXPECT_EQ(mg::DisplayConfigurationOutputId{0}, outputs[0].id);
87+ EXPECT_EQ(primary_output_id, outputs[0].id);
88 EXPECT_EQ(mg::DisplayConfigurationCardId{0}, outputs[0].card_id);
89 EXPECT_TRUE(outputs[0].connected);
90 EXPECT_TRUE(outputs[0].used);
91@@ -456,7 +464,7 @@
92 .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{
93 primary_pixel_size, primary_physical_size, format, primary_vrefresh, true}));
94 ON_CALL(mock_config, active_config_for(mga::DisplayName::external))
95- .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{mg::DisplayConfigurationOutputId{1},
96+ .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{external_output_id,
97 external_pixel_size, external_physical_size, format, external_vrefresh, true}));
98 });
99
100@@ -477,7 +485,7 @@
101 auto& disp_mode = outputs[0].modes[0];
102 EXPECT_EQ(primary_pixel_size, disp_mode.size);
103 EXPECT_EQ(primary_vrefresh, disp_mode.vrefresh_hz);
104- EXPECT_EQ(mg::DisplayConfigurationOutputId{0}, outputs[0].id);
105+ EXPECT_EQ(primary_output_id, outputs[0].id);
106 EXPECT_EQ(mg::DisplayConfigurationCardId{0}, outputs[0].card_id);
107 EXPECT_TRUE(outputs[0].connected);
108 EXPECT_TRUE(outputs[0].used);
109@@ -492,7 +500,7 @@
110 disp_mode = outputs[1].modes[0];
111 EXPECT_EQ(external_pixel_size, disp_mode.size);
112 EXPECT_EQ(external_vrefresh, disp_mode.vrefresh_hz);
113- EXPECT_EQ(mg::DisplayConfigurationOutputId{1}, outputs[1].id);
114+ EXPECT_EQ(external_output_id, outputs[1].id);
115 EXPECT_EQ(mg::DisplayConfigurationCardId{0}, outputs[1].card_id);
116 EXPECT_TRUE(outputs[1].connected);
117 EXPECT_TRUE(outputs[1].used);
118@@ -546,7 +554,7 @@
119
120 config = display.configuration();
121 config->for_each_output([](mg::UserDisplayConfigurationOutput const& c){
122- if (c.id == mg::DisplayConfigurationOutputId{0})
123+ if (c.id == primary_output_id)
124 EXPECT_EQ(mir_orientation_left, c.orientation);
125 });
126 }
127@@ -640,12 +648,12 @@
128 {
129 ON_CALL(mock_config, active_config_for(mga::DisplayName::primary))
130 .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{
131- mg::DisplayConfigurationOutputId{0}, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
132+ primary_output_id, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
133
134 ON_CALL(mock_config, active_config_for(mga::DisplayName::external))
135 .WillByDefault(Invoke([&](mga::DisplayName)
136 {
137- return mtd::StubDisplayConfigurationOutput{mg::DisplayConfigurationOutputId{1},
138+ return mtd::StubDisplayConfigurationOutput{external_output_id,
139 {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, external_connected};
140 }));
141 EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
142@@ -761,7 +769,7 @@
143 {
144 ON_CALL(mock_config, active_config_for(mga::DisplayName::external))
145 .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{
146- mg::DisplayConfigurationOutputId{1}, {0,0}, {0,0}, mir_pixel_format_abgr_8888, 0.0, true}));
147+ external_output_id, {0,0}, {0,0}, mir_pixel_format_abgr_8888, 0.0, true}));
148 EXPECT_CALL(mock_config, power_mode(mga::DisplayName::primary, _))
149 .Times(AnyNumber());
150 InSequence seq;
151@@ -883,11 +891,11 @@
152 {
153 ON_CALL(mock_config, active_config_for(mga::DisplayName::primary))
154 .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{
155- mg::DisplayConfigurationOutputId{0}, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
156+ primary_output_id, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
157 ON_CALL(mock_config, active_config_for(mga::DisplayName::external))
158 .WillByDefault(Invoke([&](mga::DisplayName)
159 {
160- return mtd::StubDisplayConfigurationOutput{mg::DisplayConfigurationOutputId{1},
161+ return mtd::StubDisplayConfigurationOutput{external_output_id,
162 {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, external_connected};
163 }));
164 EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
165@@ -926,7 +934,7 @@
166 ON_CALL(mock_config, active_config_for(_))
167 .WillByDefault(InvokeWithoutArgs([]
168 {
169- return mtd::StubDisplayConfigurationOutput{mg::DisplayConfigurationOutputId{1},
170+ return mtd::StubDisplayConfigurationOutput{external_output_id,
171 {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true};
172 }));
173 });
174@@ -953,12 +961,12 @@
175 {
176 ON_CALL(mock_config, active_config_for(mga::DisplayName::primary))
177 .WillByDefault(Return(mtd::StubDisplayConfigurationOutput{
178- mg::DisplayConfigurationOutputId{0}, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
179+ primary_output_id, {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, true}));
180
181 ON_CALL(mock_config, active_config_for(mga::DisplayName::external))
182 .WillByDefault(Invoke([&](mga::DisplayName)
183 {
184- return mtd::StubDisplayConfigurationOutput{mg::DisplayConfigurationOutputId{1},
185+ return mtd::StubDisplayConfigurationOutput{external_output_id,
186 {20,20}, {4,4}, mir_pixel_format_abgr_8888, 50.0f, external_connected};
187 }));
188 EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))

Subscribers

People subscribed via source and target branches