ash/display/json_converter_unittest.cc - Issue 2733313002: Move display preference code from ash/display/ to ui/display/manager/.

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

Issue 2733313002: Move display preference code from ash/display/ to ui/display/manager/. (Closed)

Patch Set: . Created 3 years, 9 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:

OLD	NEW
	(Empty)
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

3 // found in the LICENSE file.

4

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

6

7 #include <memory>

8

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

10 #include "base/values.h"

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

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

13

14 namespace ash {

15

16 TEST(JsonConverterTest, JsonFromToDisplayLayout) {

17 display::DisplayLayout layout;

18 layout.primary_id = 1;

19 layout.mirrored = true;

20 layout.default_unified = false;

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

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

23 layout.placement_list[0].display_id = 2;

24 layout.placement_list[0].parent_display_id = 1;

25 layout.placement_list[0].position = display::DisplayPlacement::BOTTOM;

26

27 layout.placement_list[1].display_id = 3;

28 layout.placement_list[1].parent_display_id = 2;

29 layout.placement_list[1].position = display::DisplayPlacement::LEFT;

30 layout.placement_list[1].offset = 30;

31

32 base::DictionaryValue value;

33 DisplayLayoutToJson(layout, &value);

34

35 const char data[] =

36 "{\n"

37 " \"primary-id\": \"1\",\n"

38 " \"mirrored\": true,\n"

39 " \"default_unified\": false,\n"

40 " \"display_placement\": [{\n"

41 " \"display_id\": \"2\",\n"

42 " \"parent_display_id\": \"1\",\n"

43 " \"position\": \"bottom\",\n"

44 " \"offset\": 0\n"

45 " },{\n"

46 " \"display_id\": \"3\",\n"

47 " \"parent_display_id\": \"2\",\n"

48 " \"position\": \"left\",\n"

49 " \"offset\": 30\n"

50 " }]\n"

51 "}";

52 int error_code = 0, error_line, error_column;

53 std::string error_msg;

54 std::unique_ptr<base::Value> read_value(base::JSONReader::ReadAndReturnError(

55 data, 0, &error_code, &error_msg, &error_line, &error_column));

56 ASSERT_EQ(0, error_code) << error_msg << " at " << error_line << ":"

57 << error_column;

58 EXPECT_TRUE(value.Equals(read_value.get()));

59

60 display::DisplayLayout read_layout;

61 EXPECT_TRUE(JsonToDisplayLayout(*read_value, &read_layout));

62 EXPECT_EQ(read_layout.mirrored, layout.mirrored);

63 EXPECT_EQ(read_layout.primary_id, layout.primary_id);

64 EXPECT_EQ(read_layout.default_unified, layout.default_unified);

65 EXPECT_TRUE(read_layout.HasSamePlacementList(layout));

66 }

67

68 TEST(JsonConverterTest, OldJsonToDisplayLayout) {

69 const char data[] =

70 "{\n"

71 " \"primary-id\": \"1\",\n"

72 " \"mirrored\": true,\n"

73 " \"default_unified\": false,\n"

74 " \"position\": \"bottom\",\n"

75 " \"offset\": 20\n"

76 "}";

77 int error_code = 0, error_line, error_column;

78 std::string error_msg;

79 std::unique_ptr<base::Value> read_value(base::JSONReader::ReadAndReturnError(

80 data, 0, &error_code, &error_msg, &error_line, &error_column));

81 ASSERT_EQ(0, error_code) << error_msg << " at " << error_line << ":"

82 << error_column;

83

84 display::DisplayLayout read_layout;

85 EXPECT_TRUE(JsonToDisplayLayout(*read_value, &read_layout));

86 EXPECT_EQ(true, read_layout.mirrored);

87 EXPECT_EQ(1, read_layout.primary_id);

88 EXPECT_FALSE(read_layout.default_unified);

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

90 EXPECT_EQ(display::DisplayPlacement::BOTTOM,

91 read_layout.placement_list[0].position);

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

93 }

94

95 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/display/json_converter.cc ('k') | chrome/browser/chromeos/BUILD.gn » ('j') | chrome/browser/chromeos/BUILD.gn » ('J')