Add support for multiple roots to the client lib.

mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc

 // Copyright 2014 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 "mojo/services/public/cpp/view_manager/view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace view_manager {
 namespace {
 
-const char kTestServiceURL[] = "mojo:test_url";
-const char kTestServiceURL2[] = "mojo:test_url2";
+const char kWindowManagerURL[] = "mojo:window_manager";
+const char kEmbeddedApp1URL[] = "mojo:embedded_app_1";
 
 base::RunLoop* current_run_loop = NULL;
 
 void DoRunLoop() {
   base::RunLoop run_loop;
   current_run_loop = &run_loop;
   current_run_loop->Run();
   current_run_loop = NULL;
 }
 
@@ skipping 259 matching lines @@
   ViewTreeNode* CreateNodeInParent(ViewTreeNode* parent) {
     ViewManager* parent_manager = ViewTreeNodePrivate(parent).view_manager();
     ViewTreeNode* node = ViewTreeNode::Create(parent_manager);
     parent->AddChild(node);
     return node;
   }
 
   // Embeds another version of the test app @ node.
   ViewManager* Embed(ViewManager* view_manager, ViewTreeNode* node) {
     DCHECK_EQ(view_manager, ViewTreeNodePrivate(node).view_manager());
-    view_manager->Embed(kTestServiceURL2, node);
+    node->Embed(kEmbeddedApp1URL);
     RunRunLoop();
     return GetLoadedViewManager();
   }
 
   // TODO(beng): remove these methods once all the tests are migrated.
   void DestroyViewManager1() {}
   ViewManager* view_manager_1() { return NULL; }
   ViewManager* view_manager_2() { return NULL; }
 
   ViewManager* GetLoadedViewManager() {
     ViewManager* view_manager = loaded_view_manager_;
     loaded_view_manager_ = NULL;
     return view_manager;
   }
 
   void UnloadApplication(const GURL& url) {
     test_helper_.SetLoaderForURL(scoped_ptr<ServiceLoader>(), url);
   }
 
  private:
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
+    base::Callback<void(ViewManager*)> ready_callback =
+        base::Bind(&ViewManagerTest::OnViewManagerLoaded,
+                   base::Unretained(this));
     test_helper_.Init();
     test_helper_.SetLoaderForURL(
-        scoped_ptr<ServiceLoader>(new ConnectServiceLoader(
-            base::Bind(&ViewManagerTest::OnViewManagerLoaded,
-                       base::Unretained(this)))),
-        GURL(kTestServiceURL));
+        scoped_ptr<ServiceLoader>(new ConnectServiceLoader(ready_callback)),
+        GURL(kWindowManagerURL));
     test_helper_.SetLoaderForURL(
-        scoped_ptr<ServiceLoader>(new ConnectServiceLoader(
-            base::Bind(&ViewManagerTest::OnViewManagerLoaded,
-                       base::Unretained(this)))),
-        GURL(kTestServiceURL2));
+        scoped_ptr<ServiceLoader>(new ConnectServiceLoader(ready_callback)),
+        GURL(kEmbeddedApp1URL));
 
     ConnectToService(test_helper_.service_provider(),
                      "mojo:mojo_view_manager",
                      &view_manager_init_);
     ASSERT_TRUE(ViewManagerInitConnect(view_manager_init_.get(),
-                                       kTestServiceURL));
+                                       kWindowManagerURL));
   }
 
   void ViewManagerInitConnectCallback(bool* result_cache,
                                       bool result) {
     *result_cache = result;
   }
 
   bool ViewManagerInitConnect(IViewManagerInit* view_manager_init,
                               const std::string& url) {
     bool result = false;
@@ skipping 29 matching lines @@
   ViewManager* window_manager_;
   int commit_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerTest);
 };
 
 TEST_F(ViewManagerTest, SetUp) {}
 
 TEST_F(ViewManagerTest, Embed) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
   EXPECT_TRUE(NULL != embedded);
+
+  ViewTreeNode* node_in_embedded = embedded->roots().front();
+  EXPECT_EQ(node->parent(), window_manager()->roots().front());
+  EXPECT_EQ(NULL, node_in_embedded->parent());
 }
 
 // When Window Manager embeds A @ N, then creates N2 and parents to N, N becomes
 // visible to A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, HierarchyChanged_NodeAdded) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
   ViewTreeNode* nested = ViewTreeNode::Create(window_manager());
   node->AddChild(nested);
-  WaitForTreeSizeToMatch(embedded->tree(), 2);
-  EXPECT_EQ(embedded->tree()->children().front()->id(), nested->id());
+  WaitForTreeSizeToMatch(embedded->roots().front(), 2);
+  EXPECT_EQ(embedded->roots().front()->children().front()->id(), nested->id());
 }
 
 // Window manager has two nodes, N1 & N2. Embeds A at N1. Creates node N21,
 // a child of N2. Reparents N2 to N1. N1 should become visible to A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, HierarchyChanged_NodeMoved) {
   ViewTreeNode* node1 = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node1);
+  window_manager()->roots().front()->AddChild(node1);
   ViewManager* embedded = Embed(window_manager(), node1);
-  WaitForTreeSizeToMatch(embedded->tree(), 1);
+  WaitForTreeSizeToMatch(embedded->roots().front(), 1);
 
   ViewTreeNode* node2 = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node2);
-  WaitForTreeSizeToMatch(embedded->tree(), 1);
-  EXPECT_TRUE(embedded->tree()->children().empty());
+  window_manager()->roots().front()->AddChild(node2);
+  WaitForTreeSizeToMatch(embedded->roots().front(), 1);
+  EXPECT_TRUE(embedded->roots().front()->children().empty());
 
   ViewTreeNode* node21 = ViewTreeNode::Create(window_manager());
   node2->AddChild(node21);
-  WaitForTreeSizeToMatch(embedded->tree(), 1);
-  EXPECT_TRUE(embedded->tree()->children().empty());
+  WaitForTreeSizeToMatch(embedded->roots().front(), 1);
+  EXPECT_TRUE(embedded->roots().front()->children().empty());
 
   // Makes node21 visible to |embedded|.
   node1->AddChild(node21);
-  WaitForTreeSizeToMatch(embedded->tree(), 2);
-  EXPECT_FALSE(embedded->tree()->children().empty());
-  EXPECT_EQ(embedded->tree()->children().front()->id(), node21->id());
+  WaitForTreeSizeToMatch(embedded->roots().front(), 2);
+  EXPECT_FALSE(embedded->roots().front()->children().empty());
+  EXPECT_EQ(embedded->roots().front()->children().front()->id(), node21->id());
 }
 
 // Window manager has two nodes, N1 and N11. Embeds A at N1. Removes N11 from
 // N1. N11 should disappear from A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, HierarchyChanged_NodeRemoved) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewTreeNode* nested = ViewTreeNode::Create(window_manager());
   node->AddChild(nested);
 
   ViewManager* embedded = Embed(window_manager(), node);
-  EXPECT_EQ(embedded->tree()->children().front()->id(), nested->id());
+  EXPECT_EQ(embedded->roots().front()->children().front()->id(), nested->id());
 
   node->RemoveChild(nested);
-  WaitForTreeSizeToMatch(embedded->tree(), 1);
-  EXPECT_TRUE(embedded->tree()->children().empty());
+  WaitForTreeSizeToMatch(embedded->roots().front(), 1);
+  EXPECT_TRUE(embedded->roots().front()->children().empty());
 }
 
 // Window manager has two nodes, N1 and N11. Embeds A at N1. Destroys N11.
 // N11 should disappear from A.
 // TODO(beng): verify whether or not this is a policy we like.
 TEST_F(ViewManagerTest, NodeDestroyed) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewTreeNode* nested = ViewTreeNode::Create(window_manager());
   node->AddChild(nested);
 
   ViewManager* embedded = Embed(window_manager(), node);
-  EXPECT_EQ(embedded->tree()->children().front()->id(), nested->id());
+  EXPECT_EQ(embedded->roots().front()->children().front()->id(), nested->id());
 
   // |nested| will be deleted after calling Destroy() below.
   TransportNodeId id = nested->id();
   nested->Destroy();
 
   std::set<TransportNodeId> nodes;
   nodes.insert(id);
   WaitForDestruction(embedded, &nodes, NULL);
 
-  EXPECT_TRUE(embedded->tree()->children().empty());
+  EXPECT_TRUE(embedded->roots().front()->children().empty());
   EXPECT_EQ(NULL, embedded->GetNodeById(id));
 }
 
 TEST_F(ViewManagerTest, ViewManagerDestroyed_CleanupNode) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   TransportNodeId node_id = node->id();
 
-  UnloadApplication(GURL(kTestServiceURL));
+  UnloadApplication(GURL(kWindowManagerURL));
 
   std::set<TransportNodeId> nodes;
   nodes.insert(node_id);
   WaitForDestruction(embedded, &nodes, NULL);
 
-  EXPECT_EQ(NULL, embedded->tree());
+  EXPECT_TRUE(embedded->roots().empty());
 }
 
 TEST_F(ViewManagerTest, SetActiveView) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   View* view = View::Create(window_manager());
   node->SetActiveView(view);
 
   ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
   WaitForActiveViewToChange(node_in_embedded);
 
   EXPECT_EQ(node_in_embedded->active_view()->id(), view->id());
 }
 
 TEST_F(ViewManagerTest, DestroyView) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   View* view = View::Create(window_manager());
   node->SetActiveView(view);
 
   ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
   WaitForActiveViewToChange(node_in_embedded);
 
   EXPECT_EQ(node_in_embedded->active_view()->id(), view->id());
 
   TransportViewId view_id = view->id();
   view->Destroy();
 
   std::set<TransportViewId> views;
   views.insert(view_id);
   WaitForDestruction(embedded, NULL, &views);
   EXPECT_EQ(NULL, node_in_embedded->active_view());
   EXPECT_EQ(NULL, embedded->GetViewById(view_id));
 }
 
 // Destroying the connection that created a node and view should result in that
 // node and view disappearing from all connections that see them.
 TEST_F(ViewManagerTest, ViewManagerDestroyed_CleanupNodeAndView) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   View* view = View::Create(window_manager());
   node->SetActiveView(view);
   ViewManager* embedded = Embed(window_manager(), node);
 
   TransportNodeId node_id = node->id();
   TransportViewId view_id = view->id();
 
-  UnloadApplication(GURL(kTestServiceURL));
+  UnloadApplication(GURL(kWindowManagerURL));
 
   std::set<TransportNodeId> observed_nodes;
   observed_nodes.insert(node_id);
   std::set<TransportViewId> observed_views;
   observed_views.insert(view_id);
   WaitForDestruction(embedded, &observed_nodes, &observed_views);
 
-  EXPECT_EQ(NULL, embedded->tree());
+  EXPECT_TRUE(embedded->roots().empty());
   EXPECT_EQ(NULL, embedded->GetNodeById(node_id));
   EXPECT_EQ(NULL, embedded->GetViewById(view_id));
 }
 
 // This test validates the following scenario:
 // -  a node originating from one connection
 // -  a view originating from a second connection
 // +  the connection originating the node is destroyed
 // -> the view should still exist (since the second connection is live) but
 //    should be disconnected from any nodes.
 TEST_F(ViewManagerTest,
        ViewManagerDestroyed_CleanupNodeAndViewFromDifferentConnections) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
   View* view_in_embedded = View::Create(embedded);
   ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
   node_in_embedded->SetActiveView(view_in_embedded);
 
   WaitForActiveViewToChange(node);
 
   TransportNodeId node_id = node->id();
   TransportViewId view_id = view_in_embedded->id();
 
-  UnloadApplication(GURL(kTestServiceURL));
+  UnloadApplication(GURL(kWindowManagerURL));
   std::set<TransportNodeId> nodes;
   nodes.insert(node_id);
   WaitForDestruction(embedded, &nodes, NULL);
 
-  EXPECT_EQ(NULL, embedded->tree());
+  EXPECT_TRUE(embedded->roots().empty());
   // node was owned by the window manager, so it should be gone.
   EXPECT_EQ(NULL, embedded->GetNodeById(node_id));
   // view_in_embedded was owned by the embedded app, so it should still exist,
   // but disconnected from the node tree.
   EXPECT_EQ(view_in_embedded, embedded->GetViewById(view_id));
   EXPECT_EQ(NULL, view_in_embedded->node());
 }
 
 // This test verifies that it is not possible to set the active view to a view
 // defined in a different connection.
 // TODO(beng): write these tests for ViewTreeNode::AddChild(), RemoveChild() and
 //             Contains().
 TEST_F(ViewManagerTest, SetActiveViewAcrossConnection) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   View* view_in_embedded = View::Create(embedded);
   EXPECT_DEATH(node->SetActiveView(view_in_embedded), "");
 }
 
 // This test verifies that a node hierarchy constructed in one connection
 // becomes entirely visible to the second connection when the hierarchy is
 // attached.
 TEST_F(ViewManagerTest, MapSubtreeOnAttach) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   // Create a subtree private to the window manager and make some changes to it.
   ViewTreeNode* child1 = ViewTreeNode::Create(window_manager());
   ViewTreeNode* child11 = ViewTreeNode::Create(window_manager());
   child1->AddChild(child11);
   gfx::Rect child11_bounds(800, 600);
   child11->SetBounds(child11_bounds);
   View* view11 = View::Create(window_manager());
   child11->SetActiveView(view11);
   WaitForAllChangesToBeAcked(window_manager());
 
   // When added to the shared node, the entire hierarchy and all property
   // changes should become visible to the embedded app.
   node->AddChild(child1);
-  WaitForTreeSizeToMatch(embedded->tree(), 3);
+  WaitForTreeSizeToMatch(embedded->roots().front(), 3);
 
   ViewTreeNode* child11_in_embedded = embedded->GetNodeById(child11->id());
   View* view11_in_embedded = embedded->GetViewById(view11->id());
   EXPECT_TRUE(child11_in_embedded != NULL);
   EXPECT_EQ(view11_in_embedded, child11_in_embedded->active_view());
   EXPECT_EQ(child11_bounds, child11_in_embedded->bounds());
 }
 
 // Verifies that bounds changes applied to a node hierarchy in one connection
 // are reflected to another.
 TEST_F(ViewManagerTest, SetBounds) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
   EXPECT_EQ(node->bounds(), node_in_embedded->bounds());
 
   node->SetBounds(gfx::Rect(100, 100));
   EXPECT_NE(node->bounds(), node_in_embedded->bounds());
   WaitForBoundsToChange(node_in_embedded);
   EXPECT_EQ(node->bounds(), node_in_embedded->bounds());
 }
 
 // Verifies that bounds changes applied to a node owned by a different
 // connection are refused.
 TEST_F(ViewManagerTest, SetBoundsSecurity) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
   node->SetBounds(gfx::Rect(800, 600));
   WaitForBoundsToChange(node_in_embedded);
 
   node_in_embedded->SetBounds(gfx::Rect(1024, 768));
   // Bounds change should have been rejected.
   EXPECT_EQ(node->bounds(), node_in_embedded->bounds());
 }
 
 // Verifies that a node can only be destroyed by the connection that created it.
 TEST_F(ViewManagerTest, DestroySecurity) {
   ViewTreeNode* node = ViewTreeNode::Create(window_manager());
-  window_manager()->tree()->AddChild(node);
+  window_manager()->roots().front()->AddChild(node);
   ViewManager* embedded = Embed(window_manager(), node);
 
   ViewTreeNode* node_in_embedded = embedded->GetNodeById(node->id());
 
   NodeTracker tracker2(node_in_embedded);
   node_in_embedded->Destroy();
   // Node should not have been destroyed.
   EXPECT_TRUE(tracker2.is_valid());
 
   NodeTracker tracker1(node);
   node->Destroy();
   EXPECT_FALSE(tracker1.is_valid());
 }
 
+TEST_F(ViewManagerTest, MultiRoots) {
+  ViewTreeNode* node1 = ViewTreeNode::Create(window_manager());
+  window_manager()->roots().front()->AddChild(node1);
+  ViewTreeNode* node2 = ViewTreeNode::Create(window_manager());
+  window_manager()->roots().front()->AddChild(node2);
+  ViewManager* embedded1 = Embed(window_manager(), node1);
+  ViewManager* embedded2 = Embed(window_manager(), node2);
+  EXPECT_EQ(embedded1, embedded2);
+}
+
 }  // namespace view_manager
 }  // namespace mojo