Mojo cpp bindings: support Clone() for structs and arrays which don't contain handles.

mojo/public/cpp/bindings/tests/array_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/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/array_serialization.h"
 #include "mojo/public/cpp/bindings/lib/fixed_buffer.h"
 #include "mojo/public/cpp/environment/environment.h"
+#include "mojo/public/interfaces/bindings/tests/test_structs.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
+using mojo::internal::Array_Data;
+using mojo::internal::ArrayValidateParams;
+using mojo::internal::FixedBuffer;
+using mojo::internal::NoValidateParams;
+using mojo::internal::String_Data;
+
 class CopyableType {
  public:
   CopyableType() : copied_(false), ptr_(this) { num_instances_++; }
   CopyableType(const CopyableType& other) : copied_(true), ptr_(other.ptr()) {
     num_instances_++;
   }
   CopyableType& operator=(const CopyableType& other) {
     copied_ = true;
     ptr_ = other.ptr();
     return *this;
@@ skipping 98 matching lines @@
     Array<ScopedMessagePipeHandle> handles(2);
     handles[0] = pipe.handle0.Pass();
     handles[1].reset(pipe.handle0.release());
   }
 
   // We expect the pipes to have been closed.
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(pipe0_value));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoClose(pipe1_value));
 }
 
+TEST_F(ArrayTest, Clone) {
+  {
+    // Test POD.
+    Array<int32_t> array(3);
+    for (size_t i = 0; i < array.size(); ++i)
+      array[i] = static_cast<int32_t>(i);
+
+    Array<int32_t> clone_array = array.Clone();
+    EXPECT_EQ(array.size(), clone_array.size());
+    for (size_t i = 0; i < array.size(); ++i)
+      EXPECT_EQ(array[i], clone_array[i]);
+  }
+
+  {
+    // Test copyable object.
+    Array<String> array(2);
+    array[0] = "hello";
+    array[1] = "world";
+
+    Array<String> clone_array = array.Clone();
+    EXPECT_EQ(array.size(), clone_array.size());
+    for (size_t i = 0; i < array.size(); ++i)
+      EXPECT_EQ(array[i], clone_array[i]);
+  }
+
+  {
+    // Test struct.
+    Array<RectPtr> array(2);
+    array[1] = Rect::New();
+    array[1]->x = 1;
+    array[1]->y = 2;
+    array[1]->width = 3;
+    array[1]->height = 4;
+
+    Array<RectPtr> clone_array = array.Clone();
+    EXPECT_EQ(array.size(), clone_array.size());
+    EXPECT_TRUE(clone_array[0].is_null());
+    EXPECT_EQ(array[1]->x, clone_array[1]->x);
+    EXPECT_EQ(array[1]->y, clone_array[1]->y);
+    EXPECT_EQ(array[1]->width, clone_array[1]->width);
+    EXPECT_EQ(array[1]->height, clone_array[1]->height);
+  }
+
+  {
+    // Test array of array.
+    Array<Array<int8_t>> array(2);
+    array[1] = Array<int8_t>(2);
+    array[1][0] = 0;
+    array[1][1] = 1;
+
+    Array<Array<int8_t>> clone_array = array.Clone();
+    EXPECT_EQ(array.size(), clone_array.size());
+    EXPECT_TRUE(clone_array[0].is_null());
+    EXPECT_EQ(array[1].size(), clone_array[1].size());
+    EXPECT_EQ(array[1][0], clone_array[1][0]);
+    EXPECT_EQ(array[1][1], clone_array[1][1]);
+  }
+
+  {
+    // Test that array of handles still works although Clone() is not available.
+    Array<ScopedMessagePipeHandle> array(10);
+    EXPECT_FALSE(array[0].is_valid());
+  }
+}
+
 TEST_F(ArrayTest, Serialization_ArrayOfPOD) {
   Array<int32_t> array(4);
   for (size_t i = 0; i < array.size(); ++i)
     array[i] = static_cast<int32_t>(i);
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U + 4*4U, size);
 
-  internal::FixedBuffer buf(size);
-  internal::Array_Data<int32_t>* data;
-  SerializeArray_<internal::ArrayValidateParams<0, false,
-                  internal::NoValidateParams> >(
+  FixedBuffer buf(size);
+  Array_Data<int32_t>* data;
+  SerializeArray_<ArrayValidateParams<0, false, NoValidateParams>>(
       array.Pass(), &buf, &data);
 
   Array<int32_t> array2;
   Deserialize_(data, &array2);
 
   EXPECT_EQ(4U, array2.size());
   for (size_t i = 0; i < array2.size(); ++i)
     EXPECT_EQ(static_cast<int32_t>(i), array2[i]);
 }
 
 TEST_F(ArrayTest, Serialization_ArrayOfArrayOfPOD) {
-  Array<Array<int32_t> > array(2);
+  Array<Array<int32_t>> array(2);
   for (size_t j = 0; j < array.size(); ++j) {
     Array<int32_t> inner(4);
     for (size_t i = 0; i < inner.size(); ++i)
       inner[i] = static_cast<int32_t>(i + (j * 10));
     array[j] = inner.Pass();
   }
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U + 2*8U + 2*(8U + 4*4U), size);
 
-  internal::FixedBuffer buf(size);
-  internal::Array_Data<internal::Array_Data<int32_t>*>* data;
-  SerializeArray_<internal::ArrayValidateParams<0, false,
-                  internal::ArrayValidateParams<0, false,
-                  internal::NoValidateParams> > >(
+  FixedBuffer buf(size);
+  Array_Data<Array_Data<int32_t>*>* data;
+  SerializeArray_<ArrayValidateParams<0, false,
+                  ArrayValidateParams<0, false,
+                  NoValidateParams>>>(
       array.Pass(), &buf, &data);
 
-  Array<Array<int32_t> > array2;
+  Array<Array<int32_t>> array2;
   Deserialize_(data, &array2);
 
   EXPECT_EQ(2U, array2.size());
   for (size_t j = 0; j < array2.size(); ++j) {
     const Array<int32_t>& inner = array2[j];
     EXPECT_EQ(4U, inner.size());
     for (size_t i = 0; i < inner.size(); ++i)
       EXPECT_EQ(static_cast<int32_t>(i + (j * 10)), inner[i]);
   }
 }
 
 TEST_F(ArrayTest, Serialization_ArrayOfBool) {
   Array<bool> array(10);
   for (size_t i = 0; i < array.size(); ++i)
     array[i] = i % 2 ? true : false;
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U + 8U, size);
 
-  internal::FixedBuffer buf(size);
-  internal::Array_Data<bool>* data;
-  SerializeArray_<internal::ArrayValidateParams<0, false,
-                  internal::NoValidateParams> >(
+  FixedBuffer buf(size);
+  Array_Data<bool>* data;
+  SerializeArray_<ArrayValidateParams<0, false, NoValidateParams>>(
       array.Pass(), &buf, &data);
 
   Array<bool> array2;
   Deserialize_(data, &array2);
 
   EXPECT_EQ(10U, array2.size());
   for (size_t i = 0; i < array2.size(); ++i)
     EXPECT_EQ(i % 2 ? true : false, array2[i]);
 }
 
 TEST_F(ArrayTest, Serialization_ArrayOfString) {
   Array<String> array(10);
   for (size_t i = 0; i < array.size(); ++i) {
     char c = 'A' + static_cast<char>(i);
     array[i] = String(&c, 1);
   }
 
   size_t size = GetSerializedSize_(array);
   EXPECT_EQ(8U +     // array header
             10*8U +  // array payload (10 pointers)
             10*(8U +  // string header
                 8U),  // string length of 1 padded to 8
             size);
 
-  internal::FixedBuffer buf(size);
-  internal::Array_Data<internal::String_Data*>* data;
-  SerializeArray_<internal::ArrayValidateParams<0, false,
-                  internal::ArrayValidateParams<0, false,
-                  internal::NoValidateParams> > >(
+  FixedBuffer buf(size);
+  Array_Data<String_Data*>* data;
+  SerializeArray_<ArrayValidateParams<0, false,
+                  ArrayValidateParams<0, false,
+                  NoValidateParams>>>(
       array.Pass(), &buf, &data);
 
   Array<String> array2;
   Deserialize_(data, &array2);
 
   EXPECT_EQ(10U, array2.size());
   for (size_t i = 0; i < array2.size(); ++i) {
     char c = 'A' + static_cast<char>(i);
     EXPECT_EQ(String(&c, 1), array2[i]);
   }
@@ skipping 169 matching lines @@
     EXPECT_TRUE(array[i].moved());
     EXPECT_EQ(value_ptrs[i], array[i].ptr());
   }
   array.reset();
   EXPECT_EQ(0u, MoveOnlyType::num_instances());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo