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

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

Issue 1739193004: ozone/platform/wayland: Use more realistic event processing and request flushing in tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wayland-test2
Patch Set: Use watching_ instead of base::MessageLoopForUI::IsCurrent() Created 4 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:
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 "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/ozone/platform/wayland/fake_server.h" 10 #include "ui/ozone/platform/wayland/fake_server.h"
10 #include "ui/ozone/platform/wayland/wayland_display.h" 11 #include "ui/ozone/platform/wayland/wayland_display.h"
11 12
12 namespace ui { 13 namespace ui {
13 14
14 TEST(WaylandDisplayTest, UseUnstableVersion) { 15 TEST(WaylandDisplayTest, UseUnstableVersion) {
16 base::MessageLoopForUI message_loop;
15 wl::FakeServer server; 17 wl::FakeServer server;
16 EXPECT_CALL(*server.xdg_shell(), 18 EXPECT_CALL(*server.xdg_shell(),
17 UseUnstableVersion(XDG_SHELL_VERSION_CURRENT)); 19 UseUnstableVersion(XDG_SHELL_VERSION_CURRENT));
18 ASSERT_TRUE(server.Start()); 20 ASSERT_TRUE(server.Start());
19 WaylandDisplay display; 21 WaylandDisplay display;
20 ASSERT_TRUE(display.Initialize()); 22 ASSERT_TRUE(display.Initialize());
21 wl_display_roundtrip(display.display()); 23 display.StartProcessingEvents();
24
25 base::RunLoop().RunUntilIdle();
26 server.Pause();
22 } 27 }
23 28
24 TEST(WaylandDisplayTest, Ping) { 29 TEST(WaylandDisplayTest, Ping) {
30 base::MessageLoopForUI message_loop;
25 wl::FakeServer server; 31 wl::FakeServer server;
26 ASSERT_TRUE(server.Start()); 32 ASSERT_TRUE(server.Start());
27 WaylandDisplay display; 33 WaylandDisplay display;
28 ASSERT_TRUE(display.Initialize()); 34 ASSERT_TRUE(display.Initialize());
29 wl_display_roundtrip(display.display()); 35 display.StartProcessingEvents();
30 36
37 base::RunLoop().RunUntilIdle();
31 server.Pause(); 38 server.Pause();
32 39
33 xdg_shell_send_ping(server.xdg_shell()->resource(), 1234); 40 xdg_shell_send_ping(server.xdg_shell()->resource(), 1234);
34 EXPECT_CALL(*server.xdg_shell(), Pong(1234)); 41 EXPECT_CALL(*server.xdg_shell(), Pong(1234));
35 server.Flush();
36 42
37 server.Resume(); 43 server.Resume();
38 44 base::RunLoop().RunUntilIdle();
39 wl_display_roundtrip(display.display()); 45 server.Pause();
40 } 46 }
41 47
42 } // namespace ui 48 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/wayland/wayland_display.cc ('k') | ui/ozone/platform/wayland/wayland_surface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698