JSON Schema Compiler: Added event compilation.

tools/json_schema_compiler/test/choices_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/choices.h"
 
+#include "chrome/common/extensions/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace test::api::choices;
+using namespace extensions;
 
 TEST(JsonSchemaCompilerChoicesTest, TakesIntegersParamsCreate) {
   {
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(Value::CreateBooleanValue(true));
+    scoped_ptr<ListValue> params_value(
+        ListBuilder().AppendBoolean(true).Build());
     scoped_ptr<TakesIntegers::Params> params(
         TakesIntegers::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(Value::CreateIntegerValue(6));
+    scoped_ptr<ListValue> params_value(ListBuilder().Append(6).Build());
     scoped_ptr<TakesIntegers::Params> params(
         TakesIntegers::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
     EXPECT_EQ(TakesIntegers::Params::NUMS_INTEGER, params->nums_type);
     EXPECT_FALSE(params->nums_array.get());
     EXPECT_EQ(6, *params->nums_integer);
   }
   {
-    scoped_ptr<ListValue> params_value(new ListValue());
-    scoped_ptr<ListValue> integers(new ListValue());
-    integers->Append(Value::CreateIntegerValue(6));
-    integers->Append(Value::CreateIntegerValue(8));
-    params_value->Append(integers.release());
+    scoped_ptr<ListValue> params_value(ListBuilder().Append(
+        ListBuilder().Append(6).Append(8)).Build());
     scoped_ptr<TakesIntegers::Params> params(
         TakesIntegers::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
     EXPECT_EQ(TakesIntegers::Params::NUMS_ARRAY, params->nums_type);
     EXPECT_EQ((size_t) 2, (*params->nums_array).size());
     EXPECT_EQ(6, (*params->nums_array)[0]);
     EXPECT_EQ(8, (*params->nums_array)[1]);
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
   {
-    scoped_ptr<DictionaryValue> object_param(new DictionaryValue());
-    object_param->SetWithoutPathExpansion("strings",
-        Value::CreateStringValue("asdf"));
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(object_param.release());
+    scoped_ptr<ListValue> params_value(
+        ListBuilder().Append(DictionaryBuilder().Set("strings", "asdf"))
+                     .Build());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
     EXPECT_EQ(ObjectWithChoices::Params::StringInfo::STRINGS_STRING,
         params->string_info.strings_type);
     EXPECT_EQ("asdf", *params->string_info.strings_string);
   }
   {
-    scoped_ptr<DictionaryValue> object_param(new DictionaryValue());
-    object_param->SetWithoutPathExpansion("strings",
-        Value::CreateStringValue("asdf"));
-    object_param->SetWithoutPathExpansion("integers",
-        Value::CreateIntegerValue(6));
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(object_param.release());
+    scoped_ptr<ListValue> params_value(
+        ListBuilder().Append(DictionaryBuilder().Set("strings", "asdf")
+                                                .Set("integers", 6)).Build());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
     EXPECT_EQ(ObjectWithChoices::Params::StringInfo::STRINGS_STRING,
         params->string_info.strings_type);
     EXPECT_EQ("asdf", *params->string_info.strings_string);
     EXPECT_EQ(ObjectWithChoices::Params::StringInfo::INTEGERS_INTEGER,
         params->string_info.integers_type);
     EXPECT_EQ(6, *params->string_info.integers_integer);
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreateFail) {
   {
-    scoped_ptr<DictionaryValue> object_param(new DictionaryValue());
-    object_param->SetWithoutPathExpansion("strings",
-        Value::CreateIntegerValue(5));
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(object_param.release());
+    scoped_ptr<ListValue> params_value(
+        ListBuilder().Append(DictionaryBuilder().Set("strings", 5)).Build());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
-    scoped_ptr<DictionaryValue> object_param(new DictionaryValue());
-    object_param->SetWithoutPathExpansion("strings",
-        Value::CreateStringValue("asdf"));
-    object_param->SetWithoutPathExpansion("integers",
-        Value::CreateStringValue("asdf"));
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(object_param.release());
+    scoped_ptr<ListValue> params_value(ListBuilder().Append(
+        DictionaryBuilder().Set("strings", "asdf")
+                           .Set("integers", "asdf")).Build());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
-    scoped_ptr<DictionaryValue> object_param(new DictionaryValue());
-    object_param->SetWithoutPathExpansion("integers",
-        Value::CreateIntegerValue(6));
-    scoped_ptr<ListValue> params_value(new ListValue());
-    params_value->Append(object_param.release());
+    scoped_ptr<ListValue> params_value(
+        ListBuilder().Append(DictionaryBuilder().Set("integers", 6)).Build());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, ReturnChoices) {
   {
     std::vector<int> integers;
     integers.push_back(1);
     integers.push_back(2);
-    scoped_ptr<Value> array_result(ReturnChoices::Result::Create(integers));
-    ListValue* list = NULL;
-    EXPECT_TRUE(array_result->GetAsList(&list));
-    EXPECT_EQ((size_t) 2, list->GetSize());
-    int temp;
-    EXPECT_TRUE(list->GetInteger(0, &temp));
-    EXPECT_EQ(1, temp);
-    EXPECT_TRUE(list->GetInteger(1, &temp));
-    EXPECT_EQ(2, temp);
+    scoped_ptr<ListValue> array_results(
+        ReturnChoices::Result::Create(integers));
+
+    scoped_ptr<ListValue> expected(ListBuilder().Append(
+        ListBuilder().Append(1).Append(2)).Build());
+    EXPECT_TRUE(array_results->Equals(expected.get()));
   }
   {
-    scoped_ptr<Value> single_result(ReturnChoices::Result::Create(5));
-    int temp;
-    EXPECT_TRUE(single_result->GetAsInteger(&temp));
-    EXPECT_EQ(5, temp);
+    scoped_ptr<ListValue> integer_results(ReturnChoices::Result::Create(5));
+    scoped_ptr<ListValue> expected(ListBuilder().Append(5).Build());
+    EXPECT_TRUE(integer_results->Equals(expected.get()));
   }
 }