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

Side by Side Diff: ui/ozone/platform/wayland/wayland_connection_unittest.cc

Issue 2042503002: ozone/platform/wayland: Add support for wl_output_interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WaylandDisplay => WaylandConnection, WaylandScreen => WaylandOutput Created 4 years, 6 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
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 <wayland-server-core.h> 5 #include <wayland-server-core.h>
6 #include <xdg-shell-unstable-v5-server-protocol.h> 6 #include <xdg-shell-unstable-v5-server-protocol.h>
7 7
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/ozone/platform/wayland/fake_server.h" 10 #include "ui/ozone/platform/wayland/fake_server.h"
11 #include "ui/ozone/platform/wayland/wayland_display.h" 11 #include "ui/ozone/platform/wayland/wayland_connection.h"
12 #include "ui/ozone/platform/wayland/wayland_output.h"
12 13
13 namespace ui { 14 namespace ui {
14 15
15 TEST(WaylandDisplayTest, UseUnstableVersion) { 16 TEST(WaylandConnectionTest, UseUnstableVersion) {
16 base::MessageLoopForUI message_loop; 17 base::MessageLoopForUI message_loop;
17 wl::FakeServer server; 18 wl::FakeServer server;
18 EXPECT_CALL(*server.xdg_shell(), 19 EXPECT_CALL(*server.xdg_shell(),
19 UseUnstableVersion(XDG_SHELL_VERSION_CURRENT)); 20 UseUnstableVersion(XDG_SHELL_VERSION_CURRENT));
20 ASSERT_TRUE(server.Start()); 21 ASSERT_TRUE(server.Start());
21 WaylandDisplay display; 22 WaylandConnection display;
22 ASSERT_TRUE(display.Initialize()); 23 ASSERT_TRUE(display.Initialize());
23 display.StartProcessingEvents(); 24 display.StartProcessingEvents();
24 25
25 base::RunLoop().RunUntilIdle(); 26 base::RunLoop().RunUntilIdle();
26 server.Pause(); 27 server.Pause();
27 } 28 }
28 29
29 TEST(WaylandDisplayTest, Ping) { 30 TEST(WaylandConnectionTest, Ping) {
30 base::MessageLoopForUI message_loop; 31 base::MessageLoopForUI message_loop;
31 wl::FakeServer server; 32 wl::FakeServer server;
32 ASSERT_TRUE(server.Start()); 33 ASSERT_TRUE(server.Start());
33 WaylandDisplay display; 34 WaylandConnection display;
34 ASSERT_TRUE(display.Initialize()); 35 ASSERT_TRUE(display.Initialize());
35 display.StartProcessingEvents(); 36 display.StartProcessingEvents();
36 37
37 base::RunLoop().RunUntilIdle(); 38 base::RunLoop().RunUntilIdle();
38 server.Pause(); 39 server.Pause();
39 40
40 xdg_shell_send_ping(server.xdg_shell()->resource(), 1234); 41 xdg_shell_send_ping(server.xdg_shell()->resource(), 1234);
41 EXPECT_CALL(*server.xdg_shell(), Pong(1234)); 42 EXPECT_CALL(*server.xdg_shell(), Pong(1234));
42 43
43 server.Resume(); 44 server.Resume();
44 base::RunLoop().RunUntilIdle(); 45 base::RunLoop().RunUntilIdle();
45 server.Pause(); 46 server.Pause();
46 } 47 }
47 48
49 TEST(WaylandConnectionTest, Output) {
50 base::MessageLoopForUI message_loop;
51 display::Display fake_display(1, gfx::Rect(0, 0, 800, 600));
52 wl::FakeServer server;
53 server.AddDisplay(fake_display);
54 ASSERT_TRUE(server.Start());
55 WaylandConnection connection;
56 ASSERT_TRUE(connection.Initialize());
57 connection.StartProcessingEvents();
58
59 base::RunLoop run_loop;
60 WaylandOutput::Observer output_observer(run_loop.QuitClosure(),
61 connection.PrimaryOutput());
62 run_loop.Run();
63
64 ASSERT_TRUE(connection.GetOutputList().size() == 1);
65 WaylandOutput* output = connection.PrimaryOutput();
66 ASSERT_TRUE(output->Geometry().width() == 800);
67 ASSERT_TRUE(output->Geometry().height() == 600);
68
69 server.Resume();
70 base::RunLoop().RunUntilIdle();
71 server.Pause();
72 }
73
48 } // namespace ui 74 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698