Makes views be initially hidden

mojo/services/view_manager/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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 897 matching lines @@
   // the server.
   ASSERT_TRUE(connection2_->CreateView(BuildViewId(2, 100)));
   connection2_->CopyChangesFromTracker();
   EXPECT_TRUE(connection2_->changes().empty());
 }
 
 // Verifies HierarchyChanged is correctly sent for various adds/removes.
 TEST_F(ViewManagerTest, ViewHierarchyChangedViews) {
   // 1,2->1,11.
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 2)));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 2), true));
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 11)));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 11), true));
   ASSERT_TRUE(connection_->AddView(BuildViewId(1, 2), BuildViewId(1, 11)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(true));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 1), true));
 
   // 1,1->1,2->1,11
   {
+    ASSERT_TRUE(connection2_->CreateView(BuildViewId(2, 101)));
     // Client 2 should not get anything (1,2 is from another connection).
     connection2_->ClearChanges();
     ASSERT_TRUE(connection_->AddView(BuildViewId(1, 1), BuildViewId(1, 2)));
     ASSERT_TRUE(connection2_->CreateView(BuildViewId(2, 100)));
     connection2_->CopyChangesFromTracker();
     EXPECT_TRUE(connection2_->changes().empty());
   }
 
   // 0,1->1,1->1,2->1,11.
   {
@@ skipping 12 matching lines @@
     // changed.
     ASSERT_TRUE(connection_->RemoveViewFromParent(BuildViewId(1, 1)));
     connection2_->DoRunLoopUntilChangesCount(1);
     ASSERT_EQ(1u, connection2_->changes().size());
     EXPECT_EQ("DrawnStateChanged view=1,1 drawn=false",
               ChangesToDescription1(connection2_->changes())[0]);
   }
 
   // 1,1->1,2->1,11->1,111.
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 111)));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 111), true));
   {
     connection2_->ClearChanges();
     ASSERT_TRUE(connection_->AddView(BuildViewId(1, 11), BuildViewId(1, 111)));
     ASSERT_TRUE(connection2_->CreateView(BuildViewId(2, 103)));
     connection2_->CopyChangesFromTracker();
     EXPECT_TRUE(connection2_->changes().empty());
   }
 
   // 0,1->1,1->1,2->1,11->1,111
   {
@@ skipping 455 matching lines @@
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 2)));
 
   ASSERT_TRUE(connection_->AddView(BuildViewId(0, 1), BuildViewId(1, 1)));
   {
     std::vector<TestView> views;
     connection_->GetViewTree(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());
+  }
+
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 1), true));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 2), true));
+  {
+    std::vector<TestView> views;
+    connection_->GetViewTree(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(connection_->SetViewVisibility(BuildViewId(1, 1), false));
   {
     std::vector<TestView> views;
     connection_->GetViewTree(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(ViewManagerTest, SetViewVisibilityNotifications) {
   // Create 1,1 and 1,2, 1,2 and child of 1,1 and 1,1 a child of the root.
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 1), true));
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 2)));
+  ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 2), true));
   ASSERT_TRUE(connection_->AddView(BuildViewId(0, 1), BuildViewId(1, 1)));
   ASSERT_TRUE(connection_->AddView(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(connection2_->CreateView(BuildViewId(2, 3)));
+  ASSERT_TRUE(connection2_->SetViewVisibility(BuildViewId(2, 3), true));
   connection_->ClearChanges();
   ASSERT_TRUE(connection2_->AddView(BuildViewId(1, 2), BuildViewId(2, 3)));
   connection_->DoRunLoopUntilChangesCount(1);
 
   // Hide 1,2 from connection 1. Connection 2 should see this.
   ASSERT_TRUE(connection_->SetViewVisibility(BuildViewId(1, 2), false));
   {
     connection2_->DoRunLoopUntilChangesCount(1);
     ASSERT_EQ(1u, connection2_->changes().size());
     EXPECT_EQ("VisibilityChanged view=1,2 visible=false",
@@ skipping 62 matching lines @@
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   ASSERT_TRUE(connection_->AddView(BuildViewId(0, 1), BuildViewId(1, 1)));
   {
     std::vector<TestView> views;
     connection_->GetViewTree(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",
+    EXPECT_EQ("view=1,1 parent=0,1 visible=false drawn=false",
               views[1].ToString2());
 
     ASSERT_EQ(0u, views[1].properties.size());
-
-    connection2_->DoRunLoopUntilChangesCount(1);
-    ASSERT_EQ(1u, connection2_->changes().size());
-    EXPECT_EQ("DrawnStateChanged view=1,1 drawn=true",
-              ChangesToDescription1(connection2_->changes())[0]);
   }
 
   // Set properties on 1.
   std::vector<uint8_t> one(1, '1');
   ASSERT_TRUE(connection_->SetViewProperty(BuildViewId(1, 1), "one", &one));
   {
     connection2_->DoRunLoopUntilChangesCount(1);
     ASSERT_EQ(1u, connection2_->changes().size());
     EXPECT_EQ("PropertyChanged view=1,1 key=one value=1",
               ChangesToDescription1(connection2_->changes())[0]);
@@ skipping 16 matching lines @@
     EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL",
               ChangesToDescription1(connection2_->changes())[0]);
   }
 }
 
 // WARNING: this class is deprecated and will be replaced with
 // view_manager_server_apptest soonish. Add new tests there.
 
 }  // namespace service
 }  // namespace mojo