~brandontschaefer/mir/first-round-deprecation

« back to all changes in this revision

Viewing changes to tests/unit-tests/platforms/android/server/test_hwc_configuration.cpp

  • Committer: Brandon Schaefer
  • Date: 2016-12-13 17:59:30 UTC
  • mfrom: (3787.1.93 development-branch)
  • Revision ID: brandon.schaefer@canonical.com-20161213175930-j9o7qn0b11n3kzlm
* Merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
196
196
 
197
197
    auto vrefresh_hz = 1000.0 / vrefresh_period.count();
198
198
    auto attribs = config.active_config_for(display);
199
 
    ASSERT_THAT(attribs.modes.size(), Eq(1));
 
199
    ASSERT_THAT(attribs.modes.size(), Eq(1u));
200
200
    EXPECT_THAT(attribs.modes[0].size, Eq(px_size));
201
201
    EXPECT_THAT(attribs.modes[0].vrefresh_hz, Eq(vrefresh_hz));
202
202
    EXPECT_THAT(attribs.physical_size_mm, Eq(mm_size));
215
215
        config.active_config_for(mga::DisplayName::primary);
216
216
    }, std::runtime_error);
217
217
    auto external_attribs = config.active_config_for(mga::DisplayName::external);
218
 
    EXPECT_THAT(external_attribs.modes.size(), Eq(0));
 
218
    EXPECT_THAT(external_attribs.modes.size(), Eq(0u));
219
219
    EXPECT_FALSE(external_attribs.connected);
220
220
    EXPECT_FALSE(external_attribs.used);
221
221
}
231
231
        config.active_config_for(mga::DisplayName::primary);
232
232
    }, std::runtime_error);
233
233
    auto external_attribs = config.active_config_for(mga::DisplayName::external);
234
 
    EXPECT_THAT(external_attribs.modes.size(), Eq(0));
 
234
    EXPECT_THAT(external_attribs.modes.size(), Eq(0u));
235
235
    EXPECT_FALSE(external_attribs.connected);
236
236
    EXPECT_FALSE(external_attribs.used);
237
237
}
286
286
    hotplug_fn(mga::DisplayName::primary, true);
287
287
    using namespace std::literals::chrono_literals;
288
288
    vsync_fn(mga::DisplayName::primary, mg::Frame::Timestamp{CLOCK_MONOTONIC,123ns});
289
 
    EXPECT_THAT(hotplug_call_count, Eq(2));
290
 
    EXPECT_THAT(vsync_call_count, Eq(1));
 
289
    EXPECT_THAT(hotplug_call_count, Eq(2u));
 
290
    EXPECT_THAT(vsync_call_count, Eq(1u));
291
291
}
292
292
 
293
293
TEST_F(HwcConfiguration, sets_active_config_when_needed)