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

Unified Diff: ash/mus/window_manager_unittest.cc

Issue 2739703003: Last sets of tests that can move to common_unittests (Closed)
Patch Set: comments 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_unittest.cc
diff --git a/ash/mus/window_manager_unittest.cc b/ash/mus/window_manager_unittest.cc
index a9e6371b7b092bba0e156d5cea2998ed69ed560b..90d3bc04eeda94f660a3c4321d1cf29f72928e29 100644
--- a/ash/mus/window_manager_unittest.cc
+++ b/ash/mus/window_manager_unittest.cc
@@ -62,20 +62,23 @@ class WindowTreeClientDelegate : public aura::WindowTreeClientDelegate {
DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate);
};
-class WindowManagerTest : public service_manager::test::ServiceTest {
+// NOTE: this isn't named WindowManagerTest because gtest complains about tests
+// with the same name (there is already a WindowManagerTest in ash).
+class MusWindowManagerTest : public service_manager::test::ServiceTest {
public:
- WindowManagerTest() : service_manager::test::ServiceTest("mash_unittests") {}
- ~WindowManagerTest() override {}
+ MusWindowManagerTest()
+ : service_manager::test::ServiceTest("mash_unittests") {}
+ ~MusWindowManagerTest() override {}
private:
- DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
+ DISALLOW_COPY_AND_ASSIGN(MusWindowManagerTest);
};
void OnEmbed(bool success) {
ASSERT_TRUE(success);
}
-TEST_F(WindowManagerTest, OpenWindow) {
+TEST_F(MusWindowManagerTest, OpenWindow) {
display::ScreenBase screen;
screen.display_list().AddDisplay(
display::Display(1, gfx::Rect(0, 0, 200, 200)),
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698