diff options
Diffstat (limited to 'ash/display/display_info_unittest.cc')
| -rw-r--r-- | ash/display/display_info_unittest.cc | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/ash/display/display_info_unittest.cc b/ash/display/display_info_unittest.cc index 2f30e94..01362b4 100644 --- a/ash/display/display_info_unittest.cc +++ b/ash/display/display_info_unittest.cc @@ -59,26 +59,33 @@ TEST_F(DisplayInfoTest, CreateFromSpec) { info = DisplayInfo::CreateFromSpecWithID( "200x200#300x200|200x200%59.9|100x100%60|150x100*2|150x150*1.25%30", 10); + EXPECT_EQ("0,0 200x200", info.bounds_in_native().ToString()); EXPECT_EQ(5u, info.display_modes().size()); - EXPECT_EQ("300x200", info.display_modes()[0].size.ToString()); - EXPECT_EQ("200x200", info.display_modes()[1].size.ToString()); - EXPECT_EQ("100x100", info.display_modes()[2].size.ToString()); - EXPECT_EQ("150x100", info.display_modes()[3].size.ToString()); - EXPECT_EQ("150x150", info.display_modes()[4].size.ToString()); - EXPECT_EQ(59.9f, info.display_modes()[1].refresh_rate); - EXPECT_EQ(60.0f, info.display_modes()[2].refresh_rate); - EXPECT_EQ(30.0f, info.display_modes()[4].refresh_rate); - EXPECT_EQ(1.0f, info.display_modes()[0].device_scale_factor); + // Modes are sorted in DIP for external display. + EXPECT_EQ("150x100", info.display_modes()[0].size.ToString()); + EXPECT_EQ("100x100", info.display_modes()[1].size.ToString()); + EXPECT_EQ("150x150", info.display_modes()[2].size.ToString()); + EXPECT_EQ("200x200", info.display_modes()[3].size.ToString()); + EXPECT_EQ("300x200", info.display_modes()[4].size.ToString()); + + EXPECT_EQ(0.0f, info.display_modes()[0].refresh_rate); + EXPECT_EQ(60.0f, info.display_modes()[1].refresh_rate); + EXPECT_EQ(30.0f, info.display_modes()[2].refresh_rate); + EXPECT_EQ(59.9f, info.display_modes()[3].refresh_rate); + EXPECT_EQ(0.0f, info.display_modes()[4].refresh_rate); + + EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor); EXPECT_EQ(1.0f, info.display_modes()[1].device_scale_factor); - EXPECT_EQ(1.0f, info.display_modes()[2].device_scale_factor); - EXPECT_EQ(2.0f, info.display_modes()[3].device_scale_factor); - EXPECT_EQ(1.25f, info.display_modes()[4].device_scale_factor); - EXPECT_TRUE(info.display_modes()[0].native); + EXPECT_EQ(1.25f, info.display_modes()[2].device_scale_factor); + EXPECT_EQ(1.0f, info.display_modes()[3].device_scale_factor); + EXPECT_EQ(1.0f, info.display_modes()[4].device_scale_factor); + + EXPECT_FALSE(info.display_modes()[0].native); EXPECT_FALSE(info.display_modes()[1].native); EXPECT_FALSE(info.display_modes()[2].native); EXPECT_FALSE(info.display_modes()[3].native); - EXPECT_FALSE(info.display_modes()[4].native); + EXPECT_TRUE(info.display_modes()[4].native); } TEST_F(DisplayInfoTest, DisplayModeGetSizeInDIPNormal) { |