Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: ui/display/mojo/display_struct_traits_unittest.cc

Issue 2894763003: Updates display.mojom to include more of Display (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « ui/display/mojo/display_struct_traits.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 5 #include <memory>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/display/display.h" 9 #include "ui/display/display.h"
10 #include "ui/display/display_layout.h" 10 #include "ui/display/display_layout.h"
(...skipping 13 matching lines...) Expand all
24 namespace { 24 namespace {
25 25
26 constexpr int64_t kDisplayId1 = 123; 26 constexpr int64_t kDisplayId1 = 123;
27 constexpr int64_t kDisplayId2 = 456; 27 constexpr int64_t kDisplayId2 = 456;
28 constexpr int64_t kDisplayId3 = 789; 28 constexpr int64_t kDisplayId3 = 789;
29 29
30 void CheckDisplaysEqual(const Display& input, const Display& output) { 30 void CheckDisplaysEqual(const Display& input, const Display& output) {
31 EXPECT_NE(&input, &output); // Make sure they aren't the same object. 31 EXPECT_NE(&input, &output); // Make sure they aren't the same object.
32 EXPECT_EQ(input.id(), output.id()); 32 EXPECT_EQ(input.id(), output.id());
33 EXPECT_EQ(input.bounds(), output.bounds()); 33 EXPECT_EQ(input.bounds(), output.bounds());
34 EXPECT_EQ(input.GetSizeInPixel(), output.GetSizeInPixel());
34 EXPECT_EQ(input.work_area(), output.work_area()); 35 EXPECT_EQ(input.work_area(), output.work_area());
35 EXPECT_EQ(input.device_scale_factor(), output.device_scale_factor()); 36 EXPECT_EQ(input.device_scale_factor(), output.device_scale_factor());
36 EXPECT_EQ(input.rotation(), output.rotation()); 37 EXPECT_EQ(input.rotation(), output.rotation());
37 EXPECT_EQ(input.touch_support(), output.touch_support()); 38 EXPECT_EQ(input.touch_support(), output.touch_support());
38 EXPECT_EQ(input.maximum_cursor_size(), output.maximum_cursor_size()); 39 EXPECT_EQ(input.maximum_cursor_size(), output.maximum_cursor_size());
40 EXPECT_EQ(input.color_depth(), output.color_depth());
41 EXPECT_EQ(input.depth_per_component(), output.depth_per_component());
42 EXPECT_EQ(input.is_monochrome(), output.is_monochrome());
39 } 43 }
40 44
41 void CheckDisplayLayoutsEqual(const DisplayLayout& input, 45 void CheckDisplayLayoutsEqual(const DisplayLayout& input,
42 const DisplayLayout& output) { 46 const DisplayLayout& output) {
43 EXPECT_NE(&input, &output); // Make sure they aren't the same object. 47 EXPECT_NE(&input, &output); // Make sure they aren't the same object.
44 EXPECT_EQ(input.placement_list, output.placement_list); 48 EXPECT_EQ(input.placement_list, output.placement_list);
45 EXPECT_EQ(input.mirrored, output.mirrored); 49 EXPECT_EQ(input.mirrored, output.mirrored);
46 EXPECT_EQ(input.default_unified, output.default_unified); 50 EXPECT_EQ(input.default_unified, output.default_unified);
47 EXPECT_EQ(input.primary_id, output.primary_id); 51 EXPECT_EQ(input.primary_id, output.primary_id);
48 } 52 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 const gfx::Rect bounds(100, 200, 500, 600); 122 const gfx::Rect bounds(100, 200, 500, 600);
119 const gfx::Rect work_area(150, 250, 400, 500); 123 const gfx::Rect work_area(150, 250, 400, 500);
120 const gfx::Size maximum_cursor_size(64, 64); 124 const gfx::Size maximum_cursor_size(64, 64);
121 125
122 Display input(246345234, bounds); 126 Display input(246345234, bounds);
123 input.set_work_area(work_area); 127 input.set_work_area(work_area);
124 input.set_device_scale_factor(2.0f); 128 input.set_device_scale_factor(2.0f);
125 input.set_rotation(Display::ROTATE_270); 129 input.set_rotation(Display::ROTATE_270);
126 input.set_touch_support(Display::TOUCH_SUPPORT_AVAILABLE); 130 input.set_touch_support(Display::TOUCH_SUPPORT_AVAILABLE);
127 input.set_maximum_cursor_size(maximum_cursor_size); 131 input.set_maximum_cursor_size(maximum_cursor_size);
132 input.set_color_depth(input.color_depth() + 1);
133 input.set_depth_per_component(input.depth_per_component() + 1);
134 input.set_is_monochrome(!input.is_monochrome());
128 135
129 Display output; 136 Display output;
130 SerializeAndDeserialize<mojom::Display>(input, &output); 137 SerializeAndDeserialize<mojom::Display>(input, &output);
131 138
132 CheckDisplaysEqual(input, output); 139 CheckDisplaysEqual(input, output);
133 } 140 }
134 141
135 TEST(DisplayStructTraitsTest, DefaultDisplayMode) { 142 TEST(DisplayStructTraitsTest, DefaultDisplayMode) {
136 std::unique_ptr<DisplayMode> input = 143 std::unique_ptr<DisplayMode> input =
137 base::MakeUnique<DisplayMode>(gfx::Size(1024, 768), true, 61.0); 144 base::MakeUnique<DisplayMode>(gfx::Size(1024, 768), true, 61.0);
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 maximum_cursor_size); 410 maximum_cursor_size);
404 411
405 std::unique_ptr<DisplaySnapshotMojo> output; 412 std::unique_ptr<DisplaySnapshotMojo> output;
406 SerializeAndDeserialize<mojom::DisplaySnapshotMojo>( 413 SerializeAndDeserialize<mojom::DisplaySnapshotMojo>(
407 DisplaySnapshotMojo::CreateFrom(*input), &output); 414 DisplaySnapshotMojo::CreateFrom(*input), &output);
408 415
409 CheckDisplaySnapShotMojoEqual(*input, *output); 416 CheckDisplaySnapShotMojoEqual(*input, *output);
410 } 417 }
411 418
412 } // namespace display 419 } // namespace display
OLDNEW
« no previous file with comments | « ui/display/mojo/display_struct_traits.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698