| Index: mojo/public/cpp/bindings/tests/union_unittest.cc
|
| diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc
|
| index 261b0ee43b63b152a59bfab35b03ce5f801d142c..82651dff94398e736705c9be79c2303ae06044d1 100644
|
| --- a/mojo/public/cpp/bindings/tests/union_unittest.cc
|
| +++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
|
| @@ -493,7 +493,8 @@ TEST(UnionTest, Serialization_UnionOfPods) {
|
|
|
| mojo::internal::FixedBufferForTesting buf(size);
|
| internal::SmallStruct_Data* data = nullptr;
|
| - Serialize_(small_struct.get(), &buf, &data);
|
| + EXPECT_EQ(mojo::internal::ValidationError::VALIDATION_ERROR_NONE,
|
| + Serialize_(small_struct.get(), &buf, &data));
|
|
|
| SmallStructPtr deserialized(SmallStruct::New());
|
| Deserialize_(data, deserialized.get());
|
| @@ -513,7 +514,8 @@ TEST(UnionTest, Serialization_UnionOfObjects) {
|
|
|
| mojo::internal::FixedBufferForTesting buf(size);
|
| internal::SmallObjStruct_Data* data = nullptr;
|
| - Serialize_(obj_struct.get(), &buf, &data);
|
| + EXPECT_EQ(mojo::internal::ValidationError::VALIDATION_ERROR_NONE,
|
| + Serialize_(obj_struct.get(), &buf, &data));
|
|
|
| std::vector<Handle> handles;
|
| data->EncodePointersAndHandles(&handles);
|
| @@ -536,7 +538,8 @@ TEST(UnionTest, Validation_UnionsInStruct) {
|
|
|
| mojo::internal::FixedBufferForTesting buf(size);
|
| internal::SmallStruct_Data* data = nullptr;
|
| - Serialize_(small_struct.get(), &buf, &data);
|
| + EXPECT_EQ(mojo::internal::ValidationError::VALIDATION_ERROR_NONE,
|
| + Serialize_(small_struct.get(), &buf, &data));
|
|
|
| void* raw_buf = buf.Leak();
|
| mojo::internal::BoundsChecker bounds_checker(data,
|
| @@ -556,7 +559,8 @@ TEST(UnionTest, Validation_PodUnionInStruct_Failure) {
|
|
|
| mojo::internal::FixedBufferForTesting buf(size);
|
| internal::SmallStruct_Data* data = nullptr;
|
| - Serialize_(small_struct.get(), &buf, &data);
|
| + EXPECT_EQ(mojo::internal::ValidationError::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();
|
| @@ -595,7 +599,8 @@ TEST(UnionTest, Validation_NullableUnion) {
|
|
|
| mojo::internal::FixedBufferForTesting buf(size);
|
| internal::SmallStruct_Data* data = nullptr;
|
| - Serialize_(small_struct.get(), &buf, &data);
|
| + EXPECT_EQ(mojo::internal::ValidationError::VALIDATION_ERROR_NONE,
|
| + Serialize_(small_struct.get(), &buf, &data));
|
|
|
| void* raw_buf = buf.Leak();
|
| mojo::internal::BoundsChecker bounds_checker(data,
|
| @@ -635,7 +640,8 @@ TEST(UnionTest, PodUnionInMapSerialization) {
|
| 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::ValidationError::VALIDATION_ERROR_NONE,
|
| + SerializeMap_(&map, &buf, &data, &validate_params));
|
|
|
| Map<String, PodUnionPtr> map2;
|
| Deserialize_(data, &map2);
|
| @@ -659,7 +665,8 @@ TEST(UnionTest, PodUnionInMapSerializationWithNull) {
|
| 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::ValidationError::VALIDATION_ERROR_NONE,
|
| + SerializeMap_(&map, &buf, &data, &validate_params));
|
|
|
| Map<String, PodUnionPtr> map2;
|
| Deserialize_(data, &map2);
|
|
|