mojo::Serialize*_() calls now propogate/return validation errors.

mojo/public/cpp/bindings/tests/union_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 <vector>
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.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/bounds_checker.h"
@@ skipping 473 matching lines @@
 
 // Serialization test of a struct with a union of plain old data.
 TEST(UnionTest, Serialization_UnionOfPods) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   size_t size = GetSerializedSize_(*small_struct);
 
   mojo::internal::FixedBufferForTesting buf(size);

[viettrungluu, 2015/10/09 01:35:20]

mojo::

[vardhan, 2015/10/09 22:31:29]

(See comments regarding this in other files)

   internal::SmallStruct_Data* data = nullptr;

[viettrungluu, 2015/10/09 01:35:20]

No mojo::

kill me now

[vardhan, 2015/10/09 22:31:29]

:-)

(this |internal| is a referring to the |internal| namespace that the generated
_Data mojom classes are in)

-  Serialize_(small_struct.get(), &buf, &data);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            Serialize_(small_struct.get(), &buf, &data));
 
   SmallStructPtr deserialized(SmallStruct::New());
   Deserialize_(data, deserialized.get());
 
   EXPECT_EQ(10, deserialized->pod_union->get_f_int32());
 }
 
 // Serialization test of a struct with a union of structs.
 TEST(UnionTest, Serialization_UnionOfObjects) {
   Environment environment;
   SmallObjStructPtr obj_struct(SmallObjStruct::New());
   obj_struct->obj_union = ObjectUnion::New();
   String hello("hello world");
   obj_struct->obj_union->set_f_string(hello);
 
   size_t size = GetSerializedSize_(*obj_struct);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallObjStruct_Data* data = nullptr;
-  Serialize_(obj_struct.get(), &buf, &data);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            Serialize_(obj_struct.get(), &buf, &data));
 
   std::vector<Handle> handles;
   data->EncodePointersAndHandles(&handles);
   data->DecodePointersAndHandles(&handles);
 
   SmallObjStructPtr deserialized(SmallObjStruct::New());
   Deserialize_(data, deserialized.get());
 
   EXPECT_EQ(hello, deserialized->obj_union->get_f_string());
 }
 
 // Validation test of a struct with a union.
 TEST(UnionTest, Validation_UnionsInStruct) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   size_t size = GetSerializedSize_(*small_struct);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.get(), &buf, &data);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            Serialize_(small_struct.get(), &buf, &data));
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // Validation test of a struct union fails due to unknown union tag.
 TEST(UnionTest, Validation_PodUnionInStruct_Failure) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
   small_struct->pod_union = PodUnion::New();
   small_struct->pod_union->set_f_int32(10);
 
   size_t size = GetSerializedSize_(*small_struct);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.get(), &buf, &data);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            Serialize_(small_struct.get(), &buf, &data));
   data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // Validation fails due to non-nullable null union in struct.
@@ skipping 18 matching lines @@
 
 // Validation passes with nullable null union.
 TEST(UnionTest, Validation_NullableUnion) {
   Environment environment;
   SmallStructPtr small_struct(SmallStruct::New());
 
   size_t size = GetSerializedSize_(*small_struct);
 
   mojo::internal::FixedBufferForTesting buf(size);
   internal::SmallStruct_Data* data = nullptr;
-  Serialize_(small_struct.get(), &buf, &data);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            Serialize_(small_struct.get(), &buf, &data));
 
   void* raw_buf = buf.Leak();
   mojo::internal::BoundsChecker bounds_checker(data,
                                                static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
 
 // TODO(azani): Move back in map_unittest.cc when possible.
 // Map Tests
@@ skipping 19 matching lines @@
   map["one"]->set_f_int8(8);
   map["two"]->set_f_int16(16);
 
   size_t size = GetSerializedSize_(map);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Map_Data<mojo::internal::String_Data*,
                            internal::PodUnion_Data>* data;
   mojo::internal::ArrayValidateParams validate_params(0, false, nullptr);
-  SerializeMap_(&map, &buf, &data, &validate_params);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            SerializeMap_(&map, &buf, &data, &validate_params));
 
   Map<String, PodUnionPtr> map2;
   Deserialize_(data, &map2);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_EQ(16, map2["two"]->get_f_int16());
 }
 
 TEST(UnionTest, PodUnionInMapSerializationWithNull) {
   Environment environment;
   Map<String, PodUnionPtr> map;
   map.insert("one", PodUnion::New());
   map.insert("two", nullptr);
 
   map["one"]->set_f_int8(8);
 
   size_t size = GetSerializedSize_(map);
   EXPECT_EQ(120U, size);
 
   mojo::internal::FixedBufferForTesting buf(size);
   mojo::internal::Map_Data<mojo::internal::String_Data*,
                            internal::PodUnion_Data>* data;
   mojo::internal::ArrayValidateParams validate_params(0, true, nullptr);
-  SerializeMap_(&map, &buf, &data, &validate_params);
+  EXPECT_EQ(mojo::internal::VALIDATION_ERROR_NONE,
+            SerializeMap_(&map, &buf, &data, &validate_params));
 
   Map<String, PodUnionPtr> map2;
   Deserialize_(data, &map2);
 
   EXPECT_EQ(8, map2["one"]->get_f_int8());
   EXPECT_TRUE(map2["two"].is_null());
 }
 
 TEST(UnionTest, StructInUnionGetterSetterPasser) {
   DummyStructPtr dummy(DummyStruct::New());
@@ skipping 496 matching lines @@
   PodUnionPtr pod(PodUnion::New());
   pod->set_f_int16(16);
 
   ptr->Echo(pod.Pass(),
             [](PodUnionPtr out) { EXPECT_EQ(16, out->get_f_int16()); });
   run_loop.RunUntilIdle();
 }
 
 }  // namespace test
 }  // namespace mojo