SetBounds for ViewTreeNode.

mojo/services/view_manager/view_manager_connection_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/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/shell/connect.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/shell/shell_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
 
 // TODO(sky): remove this when Darin is done with cleanup.
 template <typename T>
 class MOJO_COMMON_EXPORT TypeConverter<T, T> {
  public:
   static T ConvertFrom(T input, Buffer* buf) {
     return input;
   }
@@ skipping 21 matching lines @@
   current_run_loop->Run();
   current_run_loop = NULL;
 }
 
 // Converts |id| into a string.
 std::string NodeIdToString(TransportNodeId id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
+// Converts |rect| into a string.
+std::string RectToString(const Rect& rect) {
+  return base::StringPrintf("%d,%d %dx%d",
+                            rect.position().x(),
+                            rect.position().y(),
+                            rect.size().width(),
+                            rect.size().height());
+}
+
 // Boolean callback. Sets |result_cache| to the value of |result| and quits
 // the run loop.
 void BooleanCallback(bool* result_cache, bool result) {
   *result_cache = result;
   current_run_loop->Quit();
 }
 
 struct TestNode {
   std::string ToString() const {
     return base::StringPrintf("node=%s parent=%s view=%s",
@@ skipping 59 matching lines @@
 }
 
 // Deletes a node, blocking until done.
 bool DeleteView(IViewManager* view_manager, TransportViewId view_id) {
   bool result = false;
   view_manager->DeleteView(view_id, base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
 }
 
+bool SetNodeBounds(IViewManager* view_manager,
+                   TransportNodeId node_id,
+                   const gfx::Rect& bounds) {
+  bool result = false;
+  view_manager->SetNodeBounds(node_id, bounds,
+                              base::Bind(&BooleanCallback, &result));
+  DoRunLoop();
+  return result;
+}
+
 // Adds a node, blocking until done.
 bool AddNode(IViewManager* view_manager,
              TransportNodeId parent,
              TransportNodeId child,
              TransportChangeId server_change_id) {
   bool result = false;
   view_manager->AddNode(parent, child, server_change_id,
                         base::Bind(&BooleanCallback, &result));
   DoRunLoop();
   return result;
@@ skipping 111 matching lines @@
     QuitIfNecessary();
   }
   virtual void OnServerChangeIdAdvanced(
       uint32_t next_server_change_id) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "ServerChangeIdAdvanced %d",
             static_cast<int>(next_server_change_id)));
     QuitIfNecessary();
   }
+  virtual void OnNodeBoundsChanged(TransportNodeId node_id,
+                                   const Rect& old_bounds,
+                                   const Rect& new_bounds) {
+    changes_.push_back(
+        base::StringPrintf(
+            "BoundsChanged node=%s old_bounds=%s new_bounds=%s",
+            NodeIdToString(node_id).c_str(),
+            RectToString(old_bounds).c_str(),
+            RectToString(new_bounds).c_str()));
+    QuitIfNecessary();
+  }
   virtual void OnNodeHierarchyChanged(
       TransportNodeId node,
       TransportNodeId new_parent,
       TransportNodeId old_parent,
       TransportChangeId server_change_id,
       const mojo::Array<INode>& nodes) OVERRIDE {
     changes_.push_back(
         base::StringPrintf(
             "HierarchyChanged change_id=%d node=%s new_parent=%s old_parent=%s",
             static_cast<int>(server_change_id),
@@ skipping 838 matching lines @@
   {
     AllocationScope scope;
     std::vector<TestNode> nodes;
     GetNodeTree(view_manager2_.get(), CreateNodeId(1, 1), &nodes);
     ASSERT_EQ(2u, nodes.size());
     EXPECT_EQ("node=1,1 parent=0,1 view=null", nodes[0].ToString());
     EXPECT_EQ("node=1,11 parent=1,1 view=1,51", nodes[1].ToString());
   }
 }
 
+TEST_F(ViewManagerConnectionTest, SetNodeBounds) {
+  ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
+  ASSERT_TRUE(AddNode(view_manager_.get(),
+                      CreateNodeId(0, 1),
+                      CreateNodeId(1, 1),
+                      1));
+  EstablishSecondConnection();
+
+  AllocationScope scope;
+  ASSERT_TRUE(SetNodeBounds(view_manager_.get(),
+                            CreateNodeId(1, 1),
+                            gfx::Rect(0, 0, 100, 100)));
+
+  client2_.DoRunLoopUntilChangesCount(1);
+  Changes changes(client2_.GetAndClearChanges());
+  ASSERT_EQ(1u, changes.size());
+  EXPECT_EQ("BoundsChanged node=1,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100",
+            changes[0]);
+}
+
 TEST_F(ViewManagerConnectionTest, SetRoots) {
   // Create 1, 2, and 3 in the first connection.
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 1));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 2));
   ASSERT_TRUE(CreateNode(view_manager_.get(), 1, 3));
 
   // Parent 1 to the root.
   ASSERT_TRUE(AddNode(view_manager_.get(),
                       CreateNodeId(0, 1),
                       CreateNodeId(client_.id(), 1),
@@ skipping 72 matching lines @@
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("ServerChangeIdAdvanced 6", changes[0]);
   }
 }
 
 // TODO: add tests that verify can't manipulate trees of uknown nodes.
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo