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

Unified Diff: mash/wm/window_manager_apptest.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/apptest_manifest.json ('k') | mash/wm/window_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_apptest.cc
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc
deleted file mode 100644
index 605b8255ccd7ca7888991b1fb62f5e4669d1be86..0000000000000000000000000000000000000000
--- a/mash/wm/window_manager_apptest.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <stdint.h>
-#include <utility>
-
-#include "base/bind.h"
-#include "base/macros.h"
-#include "components/mus/public/cpp/window.h"
-#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"
-
-namespace mash {
-namespace wm {
-
-class WindowTreeDelegateImpl : public mus::WindowTreeDelegate {
- public:
- WindowTreeDelegateImpl() {}
- ~WindowTreeDelegateImpl() override {}
-
- private:
- // mus::WindowTreeDelegate:
- void OnEmbed(mus::Window* root) override {}
- void OnConnectionLost(mus::WindowTreeConnection* connection) override {}
-
- DISALLOW_COPY_AND_ASSIGN(WindowTreeDelegateImpl);
-};
-
-using WindowManagerAppTest = mojo::test::ApplicationTestBase;
-
-void OnEmbed(bool success) {
- ASSERT_TRUE(success);
-}
-
-TEST_F(WindowManagerAppTest, OpenWindow) {
- WindowTreeDelegateImpl window_tree_delegate;
-
- // Bring up the the desktop_wm.
- connector()->Connect("mojo:desktop_wm");
-
- // Connect to mus and create a new top level window. The request goes to
- // the |desktop_wm|, but is async.
- scoped_ptr<mus::WindowTreeConnection> connection(
- mus::WindowTreeConnection::Create(&window_tree_delegate, connector()));
- mus::Window* top_level_window = connection->NewTopLevelWindow(nullptr);
- ASSERT_TRUE(top_level_window);
- mus::Window* child_window = connection->NewWindow();
- ASSERT_TRUE(child_window);
- top_level_window->AddChild(child_window);
-
- // Create another WindowTreeConnection by way of embedding in
- // |child_window|. This blocks until it succeeds.
- mus::mojom::WindowTreeClientPtr tree_client;
- auto tree_client_request = GetProxy(&tree_client);
- child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed));
- scoped_ptr<mus::WindowTreeConnection> child_connection(
- mus::WindowTreeConnection::Create(
- &window_tree_delegate, std::move(tree_client_request),
- mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED));
- ASSERT_TRUE(!child_connection->GetRoots().empty());
-}
-
-} // namespace wm
-} // namespace mash
« no previous file with comments | « mash/wm/apptest_manifest.json ('k') | mash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698