ash/display/json_converter_unittest.cc - Issue 2540313002: Split //ui/display and create //ui/display/manager.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/display/json_converter_unittest.cc

Issue 2540313002: Split //ui/display and create //ui/display/manager. (Closed)

Patch Set: Cleanup export header. Created 4 years 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 unified diff | Download patch

« no previous file with comments | « ash/display/json_converter.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/display/json_converter.h"	5 #include "ash/display/json_converter.h"

6	6

7 #include <memory>	7 #include <memory>

8	8

9 #include "base/json/json_reader.h"	9 #include "base/json/json_reader.h"

10 #include "base/values.h"	10 #include "base/values.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

12 #include "ui/display/manager/display_layout.h"	12 #include "ui/display/display_layout.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

16 TEST(JsonConverterTest, JsonFromToDisplayLayout) {	16 TEST(JsonConverterTest, JsonFromToDisplayLayout) {

17 display::DisplayLayout layout;	17 display::DisplayLayout layout;

18 layout.primary_id = 1;	18 layout.primary_id = 1;

19 layout.mirrored = true;	19 layout.mirrored = true;

20 layout.default_unified = false;	20 layout.default_unified = false;

21 layout.placement_list.push_back(display::DisplayPlacement());	21 layout.placement_list.push_back(display::DisplayPlacement());

22 layout.placement_list.push_back(display::DisplayPlacement());	22 layout.placement_list.push_back(display::DisplayPlacement());

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 EXPECT_EQ(true, read_layout.mirrored);	86 EXPECT_EQ(true, read_layout.mirrored);

87 EXPECT_EQ(1, read_layout.primary_id);	87 EXPECT_EQ(1, read_layout.primary_id);

88 EXPECT_FALSE(read_layout.default_unified);	88 EXPECT_FALSE(read_layout.default_unified);

89 ASSERT_EQ(1u, read_layout.placement_list.size());	89 ASSERT_EQ(1u, read_layout.placement_list.size());

90 EXPECT_EQ(display::DisplayPlacement::BOTTOM,	90 EXPECT_EQ(display::DisplayPlacement::BOTTOM,

91 read_layout.placement_list[0].position);	91 read_layout.placement_list[0].position);

92 EXPECT_EQ(20, read_layout.placement_list[0].offset);	92 EXPECT_EQ(20, read_layout.placement_list[0].offset);

93 }	93 }

94	94

95 } // namespace ash	95 } // namespace ash

OLD	NEW