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

Unified Diff: mash/wm/window_manager_unittest.cc

Issue 1822133002: Converts mash_wm_apptests to unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/window_manager_apptest.cc ('k') | mojo/tools/data/apptests » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_unittest.cc
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_unittest.cc
similarity index 87%
rename from mash/wm/window_manager_apptest.cc
rename to mash/wm/window_manager_unittest.cc
index 605b8255ccd7ca7888991b1fb62f5e4669d1be86..5b9e16deaededed5f4c6e6f27d973967f41d4729 100644
--- a/mash/wm/window_manager_apptest.cc
+++ b/mash/wm/window_manager_unittest.cc
@@ -11,7 +11,7 @@
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "components/mus/public/interfaces/window_tree.mojom.h"
-#include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/shell_test.h"
namespace mash {
namespace wm {
@@ -29,13 +29,20 @@ class WindowTreeDelegateImpl : public mus::WindowTreeDelegate {
DISALLOW_COPY_AND_ASSIGN(WindowTreeDelegateImpl);
};
-using WindowManagerAppTest = mojo::test::ApplicationTestBase;
+class WindowManagerTest : public mojo::test::ShellTest {
+ public:
+ WindowManagerTest() : mojo::test::ShellTest("exe:mash_unittests") {}
+ ~WindowManagerTest() override {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
+};
void OnEmbed(bool success) {
ASSERT_TRUE(success);
}
-TEST_F(WindowManagerAppTest, OpenWindow) {
+TEST_F(WindowManagerTest, OpenWindow) {
WindowTreeDelegateImpl window_tree_delegate;
// Bring up the the desktop_wm.
« no previous file with comments | « mash/wm/window_manager_apptest.cc ('k') | mojo/tools/data/apptests » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698