Makes views be initially hidden

mojo/services/view_manager/view_manager_service_apptest.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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
@@ skipping 623 matching lines @@
   // different connection). Create a view to ensure we got a response from
   // the server.
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 100)));
   EXPECT_TRUE(changes2()->empty());
 }
 
 // Verifies HierarchyChanged is correctly sent for various adds/removes.
 TEST_F(ViewManagerServiceAppTest, ViewHierarchyChangedViews) {
   // 1,2->1,11.
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 2), true));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 11)));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 11), true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 2), BuildViewId(1, 11)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), true));
+
+  ASSERT_TRUE(WaitForAllMessages(vm2()));
+  changes2()->clear();
 
   // 1,1->1,2->1,11
   {
     // Client 2 should not get anything (1,2 is from another connection).
-    changes2()->clear();
     ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 1), BuildViewId(1, 2)));
-    ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 100)));
+    ASSERT_TRUE(WaitForAllMessages(vm2()));
     EXPECT_TRUE(changes2()->empty());
   }
 
   // 0,1->1,1->1,2->1,11.
   {
     // Client 2 is now connected to the root, so it should have gotten a drawn
     // notification.
     ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
     vm_client2_->WaitForChangeCount(1u);
     EXPECT_EQ("DrawnStateChanged view=1,1 drawn=true",
               SingleChangeToDescription(*changes2()));
   }
 
   // 1,1->1,2->1,11.
   {
     // Client 2 is no longer connected to the root, should get drawn state
     // changed.
     changes2()->clear();
     ASSERT_TRUE(RemoveViewFromParent(vm1(), BuildViewId(1, 1)));
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,1 drawn=false",
               SingleChangeToDescription(*changes2()));
   }
 
   // 1,1->1,2->1,11->1,111.
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 111)));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 111), true));
   {
     changes2()->clear();
     ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 11), BuildViewId(1, 111)));
-    ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 103)));
+    ASSERT_TRUE(WaitForAllMessages(vm2()));
     EXPECT_TRUE(changes2()->empty());
   }
 
   // 0,1->1,1->1,2->1,11->1,111
   {
     changes2()->clear();
     ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("DrawnStateChanged view=1,1 drawn=true",
               SingleChangeToDescription(*changes2()));
@@ skipping 419 matching lines @@
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
 
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   {
     std::vector<TestView> views;
     GetViewTree(vm1(), BuildViewId(0, 1), &views);
     ASSERT_EQ(2u, views.size());
     EXPECT_EQ("view=0,1 parent=null visible=true drawn=true",
               views[0].ToString2());
+    EXPECT_EQ("view=1,1 parent=0,1 visible=false drawn=false",
+              views[1].ToString2());
+  }
+
+  // Show all the views.
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), true));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 2), true));
+  {
+    std::vector<TestView> views;
+    GetViewTree(vm1(), BuildViewId(0, 1), &views);
+    ASSERT_EQ(2u, views.size());
+    EXPECT_EQ("view=0,1 parent=null visible=true drawn=true",
+              views[0].ToString2());
     EXPECT_EQ("view=1,1 parent=0,1 visible=true drawn=true",
               views[1].ToString2());
   }
 
   // Hide 1.
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), false));
   {
     std::vector<TestView> views;
     GetViewTree(vm1(), BuildViewId(1, 1), &views);
     ASSERT_EQ(1u, views.size());
@@ skipping 23 matching lines @@
               views[0].ToString2());
     EXPECT_EQ("view=1,2 parent=1,1 visible=true drawn=true",
               views[1].ToString2());
   }
 }
 
 // Assertions for SetViewVisibility sending notifications.
 TEST_F(ViewManagerServiceAppTest, SetViewVisibilityNotifications) {
   // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 1), true));
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 2)));
+  ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 2), true));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(AddView(vm1(), BuildViewId(1, 1), BuildViewId(1, 2)));
 
   // Establish the second connection at 1,2.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnectionWithRoot(BuildViewId(1, 2)));
 
   // Add 2,3 as a child of 1,2.
   ASSERT_TRUE(CreateView(vm2(), BuildViewId(2, 3)));
-  changes1()->clear();
+  ASSERT_TRUE(SetViewVisibility(vm2(), BuildViewId(2, 3), true));
   ASSERT_TRUE(AddView(vm2(), BuildViewId(1, 2), BuildViewId(2, 3)));
-  vm_client1_.WaitForChangeCount(1);
+  WaitForAllMessages(vm1());
 
   changes2()->clear();
   // Hide 1,2 from connection 1. Connection 2 should see this.
   ASSERT_TRUE(SetViewVisibility(vm1(), BuildViewId(1, 2), false));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("VisibilityChanged view=1,2 visible=false",
               SingleChangeToDescription(*changes2()));
   }
 
@@ skipping 57 matching lines @@
   ASSERT_TRUE(CreateView(vm1(), BuildViewId(1, 1)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
   changes2()->clear();
 
   ASSERT_TRUE(AddView(vm1(), BuildViewId(0, 1), BuildViewId(1, 1)));
   {
     std::vector<TestView> views;
     GetViewTree(vm1(), BuildViewId(0, 1), &views);
     ASSERT_EQ(2u, views.size());
-    EXPECT_EQ("view=0,1 parent=null visible=true drawn=true",
-              views[0].ToString2());
-    EXPECT_EQ("view=1,1 parent=0,1 visible=true drawn=true",
-              views[1].ToString2());
-
+    EXPECT_EQ(BuildViewId(0, 1), views[0].view_id);
+    EXPECT_EQ(BuildViewId(1, 1), views[1].view_id);
     ASSERT_EQ(0u, views[1].properties.size());
-
-    vm_client2_->WaitForChangeCount(1);
-    EXPECT_EQ("DrawnStateChanged view=1,1 drawn=true",
-              SingleChangeToDescription(*changes2()));
   }
 
   // Set properties on 1.
   changes2()->clear();
   std::vector<uint8_t> one(1, '1');
   ASSERT_TRUE(SetViewProperty(vm1(), BuildViewId(1, 1), "one", &one));
   {
     vm_client2_->WaitForChangeCount(1);
     EXPECT_EQ("PropertyChanged view=1,1 key=one value=1",
               SingleChangeToDescription(*changes2()));
@@ skipping 106 matching lines @@
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 // TODO(sky): make sure coverage of what was
 // ViewManagerTest.SecondEmbedRoot_InitService and
 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager
 // tests.
 
 }  // namespace service
 }  // namespace mojo