ash/display/display_manager_unittest.cc - Issue 2185773002: Refactor: remove SetDisplayWorkAreaInsets calls.

Unified Diff: ash/display/display_manager_unittest.cc

Issue 2185773002: Refactor: remove SetDisplayWorkAreaInsets calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ash/display/display_manager.cc ('K') | « ash/display/display_manager.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | ash/display/window_tree_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/display/display_manager_unittest.cc

diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc

index 252930de62abbe818b2a7c205c58be6516ab35b7..ea3a992a19e6467dcad2b7c702eec5b308a25054 100644

--- a/ash/display/display_manager_unittest.cc

+++ b/ash/display/display_manager_unittest.cc

@@ -160,10 +160,10 @@ TEST_P(DisplayManagerTest, UpdateDisplayTest) {

EXPECT_EQ("0,0 500x500",

display_manager()->GetDisplayAt(0).bounds().ToString());

- EXPECT_EQ("1 1 0", GetCountSummary());

- EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id());

+ EXPECT_EQ("2 1 0", GetCountSummary());

+ EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[1].id());

oshima 2016/07/26 20:53:03 can you check ids for both displays?

hariank 2016/07/26 22:05:16 Done.

EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id());

- EXPECT_EQ("0,0 500x500", changed()[0].bounds().ToString());

+ EXPECT_EQ("0,0 500x500", changed()[1].bounds().ToString());

oshima 2016/07/26 20:53:03 ditto

hariank 2016/07/26 22:05:16 Done.

// Secondary display is on right.

EXPECT_EQ("500,0 400x400", added()[0].bounds().ToString());

EXPECT_EQ("0,501 400x400",

@@ -185,7 +185,7 @@ TEST_P(DisplayManagerTest, UpdateDisplayTest) {

// Add secondary.

UpdateDisplay("1+1-1000x600,1002+0-600x400");

EXPECT_EQ(2U, display_manager()->GetNumDisplays());

- EXPECT_EQ("0 1 0", GetCountSummary());

+ EXPECT_EQ("1 1 0", GetCountSummary());

oshima 2016/07/26 20:53:03 check the id of the changed display.

hariank 2016/07/26 22:05:16 Done.

EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id());

// Secondary display is on right.

EXPECT_EQ("1000,0 600x400", added()[0].bounds().ToString());

@@ -270,7 +270,7 @@ TEST_P(DisplayManagerTest, EmulatorTest) {

display_manager()->AddRemoveDisplay();

// Update primary and add seconary.

EXPECT_EQ(2U, display_manager()->GetNumDisplays());

- EXPECT_EQ("0 1 0", GetCountSummary());

+ EXPECT_EQ("1 1 0", GetCountSummary());

reset();

display_manager()->AddRemoveDisplay();

@@ -280,7 +280,7 @@ TEST_P(DisplayManagerTest, EmulatorTest) {

display_manager()->AddRemoveDisplay();

EXPECT_EQ(2U, display_manager()->GetNumDisplays());

- EXPECT_EQ("0 1 0", GetCountSummary());

+ EXPECT_EQ("1 1 0", GetCountSummary());

}

// Tests support for 3 displays.

@@ -302,11 +302,11 @@ TEST_P(DisplayManagerTest, UpdateThreeDisplaysWithDefaultLayout) {

EXPECT_EQ("960,0 400x300",

display_manager()->GetDisplayAt(2).bounds().ToString());

- EXPECT_EQ("1 2 0", GetCountSummary());

- EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[0].id());

+ EXPECT_EQ("3 2 0", GetCountSummary());

+ EXPECT_EQ(display_manager()->GetDisplayAt(0).id(), changed()[2].id());

oshima 2016/07/26 20:53:03 ditto

hariank 2016/07/26 22:05:16 Done.

EXPECT_EQ(display_manager()->GetDisplayAt(1).id(), added()[0].id());

EXPECT_EQ(display_manager()->GetDisplayAt(2).id(), added()[1].id());

- EXPECT_EQ("0,0 640x480", changed()[0].bounds().ToString());

+ EXPECT_EQ("0,0 640x480", changed()[2].bounds().ToString());

oshima 2016/07/26 20:53:03 ditto

hariank 2016/07/26 22:05:16 Done.

// Secondary and terniary displays are on right.

EXPECT_EQ("640,0 320x200", added()[0].bounds().ToString());

EXPECT_EQ("1000,0 320x200",