Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/json_schema_compiler/test/choices_unittest.cc

Issue 10701012: JSON Schema Compiler: Added event compilation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Tested GetAllPossibleParameterLists better. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/json_schema_compiler/test/choices.json ('k') | tools/json_schema_compiler/test/crossref_unittest.cc » ('j') | tools/json_schema_compiler/test/forbidden.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/json_schema_compiler/test/choices_unittest.cc
diff --git a/tools/json_schema_compiler/test/choices_unittest.cc b/tools/json_schema_compiler/test/choices_unittest.cc
index dcdfd77c060a7a69521fe2f3b90ffc231d6f0129..75e6be4699935859763f83fbf507c2303317e6b6 100644
--- a/tools/json_schema_compiler/test/choices_unittest.cc
+++ b/tools/json_schema_compiler/test/choices_unittest.cc
@@ -4,21 +4,22 @@
#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());
@@ -27,11 +28,8 @@ TEST(JsonSchemaCompilerChoicesTest, TakesIntegersParamsCreate) {
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());
@@ -44,11 +42,9 @@ TEST(JsonSchemaCompilerChoicesTest, TakesIntegersParamsCreate) {
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());
@@ -57,13 +53,9 @@ TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
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());
@@ -78,33 +70,23 @@ TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
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());
@@ -116,20 +98,16 @@ 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()));
}
}
« no previous file with comments | « tools/json_schema_compiler/test/choices.json ('k') | tools/json_schema_compiler/test/crossref_unittest.cc » ('j') | tools/json_schema_compiler/test/forbidden.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698