Overhaul JSON Schema Compiler to support a number of features required to

tools/json_schema_compiler/test/arrays_unittest.cc

 // Copyright (c) 2012 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 "tools/json_schema_compiler/test/arrays.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace test::api::arrays;
 
@@ skipping 28 matching lines @@
   value->Set("val", Value::CreateIntegerValue(val));
   return value;
 }
 
 }  // namespace
 
 TEST(JsonSchemaCompilerArrayTest, BasicArrayType) {
   {
     scoped_ptr<DictionaryValue> value = CreateBasicArrayTypeDictionary();
     scoped_ptr<BasicArrayType> basic_array_type(new BasicArrayType());
-    EXPECT_TRUE(BasicArrayType::Populate(*value, basic_array_type.get()));
+    ASSERT_TRUE(BasicArrayType::Populate(*value, basic_array_type.get()));
     EXPECT_TRUE(value->Equals(basic_array_type->ToValue().get()));
   }
 }
 
 TEST(JsonSchemaCompilerArrayTest, EnumArrayType) {
-  std::vector<EnumArrayType::TypesElement> enums;
-  enums.push_back(EnumArrayType::TYPES_ELEMENT_ONE);
-  enums.push_back(EnumArrayType::TYPES_ELEMENT_TWO);
-  enums.push_back(EnumArrayType::TYPES_ELEMENT_THREE);
+  std::vector<EnumArrayType::TypesType> enums;
+  enums.push_back(EnumArrayType::TYPES_TYPE_ONE);
+  enums.push_back(EnumArrayType::TYPES_TYPE_TWO);
+  enums.push_back(EnumArrayType::TYPES_TYPE_THREE);
 
   scoped_ptr<ListValue> types(new ListValue());
   for (size_t i = 0; i < enums.size(); ++i)
-    types->Append(EnumArrayType::CreateEnumValue(enums[i]).release());
+    types->Append(new base::StringValue(EnumArrayType::ToString(enums[i])));
 
   DictionaryValue value;
   value.Set("types", types.release());
 
   EnumArrayType enum_array_type;
-  EXPECT_TRUE(EnumArrayType::Populate(value, &enum_array_type));
+  ASSERT_TRUE(EnumArrayType::Populate(value, &enum_array_type));
   EXPECT_EQ(enums, enum_array_type.types);
 }
 
 TEST(JsonSchemaCompilerArrayTest, OptionalEnumArrayType) {
   {
-    std::vector<OptionalEnumArrayType::TypesElement> enums;
-    enums.push_back(OptionalEnumArrayType::TYPES_ELEMENT_ONE);
-    enums.push_back(OptionalEnumArrayType::TYPES_ELEMENT_TWO);
-    enums.push_back(OptionalEnumArrayType::TYPES_ELEMENT_THREE);
+    std::vector<OptionalEnumArrayType::TypesType> enums;
+    enums.push_back(OptionalEnumArrayType::TYPES_TYPE_ONE);
+    enums.push_back(OptionalEnumArrayType::TYPES_TYPE_TWO);
+    enums.push_back(OptionalEnumArrayType::TYPES_TYPE_THREE);
 
     scoped_ptr<ListValue> types(new ListValue());
-    for (size_t i = 0; i < enums.size(); ++i)
-      types->Append(OptionalEnumArrayType::CreateEnumValue(enums[i]).release());
+    for (size_t i = 0; i < enums.size(); ++i) {
+      types->Append(new base::StringValue(
+          OptionalEnumArrayType::ToString(enums[i])));
+    }
 
     DictionaryValue value;
     value.Set("types", types.release());
 
     OptionalEnumArrayType enum_array_type;
-    EXPECT_TRUE(OptionalEnumArrayType::Populate(value, &enum_array_type));
+    ASSERT_TRUE(OptionalEnumArrayType::Populate(value, &enum_array_type));
     EXPECT_EQ(enums, *enum_array_type.types);
   }
   {
     DictionaryValue value;
     scoped_ptr<ListValue> enum_array(new ListValue());
     enum_array->Append(Value::CreateStringValue("invalid"));
 
     value.Set("types", enum_array.release());
     OptionalEnumArrayType enum_array_type;
-    EXPECT_FALSE(OptionalEnumArrayType::Populate(value, &enum_array_type));
+    ASSERT_FALSE(OptionalEnumArrayType::Populate(value, &enum_array_type));
     EXPECT_TRUE(enum_array_type.types->empty());
   }
 }
 
 TEST(JsonSchemaCompilerArrayTest, RefArrayType) {
   {
     scoped_ptr<DictionaryValue> value(new DictionaryValue());
     scoped_ptr<ListValue> ref_array(new ListValue());
     ref_array->Append(CreateItemValue(1));
     ref_array->Append(CreateItemValue(2));
@@ skipping 38 matching lines @@
   scoped_ptr<ListValue> any_array(new ListValue());
   any_array->Append(Value::CreateIntegerValue(1));
   any_array->Append(Value::CreateStringValue("test"));
   any_array->Append(CreateItemValue(2));
   params_value->Append(any_array.release());
   scoped_ptr<AnyArray::Params> params(
       AnyArray::Params::Create(*params_value));
   EXPECT_TRUE(params.get());
   ASSERT_EQ(3u, params->anys.size());
   int int_temp = 0;
-  EXPECT_TRUE(params->anys[0]->value().GetAsInteger(&int_temp));
+  EXPECT_TRUE(params->anys[0]->GetAsInteger(&int_temp));
   EXPECT_EQ(1, int_temp);
 }
 
 TEST(JsonSchemaCompilerArrayTest, ObjectArrayParamsCreate) {
   scoped_ptr<ListValue> params_value(new ListValue());
   scoped_ptr<ListValue> item_array(new ListValue());
   item_array->Append(CreateItemValue(1));
   item_array->Append(CreateItemValue(2));
   params_value->Append(item_array.release());
   scoped_ptr<ObjectArray::Params> params(
       ObjectArray::Params::Create(*params_value));
   EXPECT_TRUE(params.get());
   ASSERT_EQ(2u, params->objects.size());
-  int object_val = 0;
-  EXPECT_TRUE(params->objects[0]->additional_properties.GetInteger(
-      "val", &object_val));
-  EXPECT_EQ(1, object_val);
-  EXPECT_TRUE(params->objects[1]->additional_properties.GetInteger(
-      "val", &object_val));
-  EXPECT_EQ(2, object_val);
+  EXPECT_EQ(1, params->objects[0]->additional_properties["val"]);
+  EXPECT_EQ(2, params->objects[1]->additional_properties["val"]);
 }
 
 TEST(JsonSchemaCompilerArrayTest, RefArrayParamsCreate) {
   scoped_ptr<ListValue> params_value(new ListValue());
   scoped_ptr<ListValue> item_array(new ListValue());
   item_array->Append(CreateItemValue(1));
   item_array->Append(CreateItemValue(2));
   params_value->Append(item_array.release());
   scoped_ptr<RefArray::Params> params(
       RefArray::Params::Create(*params_value));
@@ skipping 29 matching lines @@
   ListValue* expected_argument = new ListValue();
   DictionaryValue* first = new DictionaryValue();
   first->SetInteger("val", 1);
   expected_argument->Append(first);
   DictionaryValue* second = new DictionaryValue();
   second->SetInteger("val", 2);
   expected_argument->Append(second);
   expected.Append(expected_argument);
   EXPECT_TRUE(results->Equals(&expected));
 }