JSON Schema Compiler now supports conversion from Choice to base::Value.

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 "testing/gtest/include/gtest/gtest.h"
 
 using namespace test::api::choices;
 
@@ skipping 93 matching lines @@
     object_param->SetWithoutPathExpansion("integers",
         Value::CreateIntegerValue(6));
     scoped_ptr<ListValue> params_value(new ListValue());
     params_value->Append(object_param.release());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
 }
 
+TEST(JsonSchemaCompilerChoicesTest, PopulateChoiceType) {
+  Value* integers_value = Value::CreateIntegerValue(5);
+  ListValue* strings_value(new ListValue());

[not at google - send to devlin, 2012/07/18 01:21:35]

nit: = new ListValue()

[chebert, 2012/07/19 00:56:01]

Done.

+  strings_value->Append(Value::CreateStringValue("list"));
+  strings_value->Append(Value::CreateStringValue("of"));
+  strings_value->Append(Value::CreateStringValue("strings"));
+
+  scoped_ptr<DictionaryValue> value(new DictionaryValue());

[not at google - send to devlin, 2012/07/18 01:21:35]

value on stack

[chebert, 2012/07/19 00:56:01]

Done.

+  value->Set("integers", integers_value);

[not at google - send to devlin, 2012/07/18 01:21:35]

just inline integers_value here. Should be able to SetInteger("integers", 5)

[chebert, 2012/07/19 00:56:01]

Done.

+  value->Set("strings", strings_value);
+
+  scoped_ptr<ChoiceType> out(new ChoiceType);

[not at google - send to devlin, 2012/07/18 01:21:35]

Just put on stack, use &out rather than out.get() etc.

[chebert, 2012/07/19 00:56:01]

Done.

+  ASSERT_TRUE(ChoiceType::Populate(*value, out.get()));
+  EXPECT_EQ(ChoiceType::INTEGERS_INTEGER, out->integers_type);
+  EXPECT_EQ(ChoiceType::STRINGS_ARRAY, out->strings_type);

[not at google - send to devlin, 2012/07/18 01:21:35]

check values are correct too?

[chebert, 2012/07/19 00:56:01]

Done.

+}
+
+TEST(JsonSchemaCompilerChoicesTest, ChoiceTypeToValue) {
+  Value* integers_value = Value::CreateIntegerValue(5);
+  ListValue* strings_value(new ListValue());
+  strings_value->Append(Value::CreateStringValue("list"));
+  strings_value->Append(Value::CreateStringValue("of"));
+  strings_value->Append(Value::CreateStringValue("strings"));
+
+  scoped_ptr<DictionaryValue> value(new DictionaryValue());

[not at google - send to devlin, 2012/07/18 01:21:35]

ditto value on stack

[chebert, 2012/07/19 00:56:01]

Done.

+  value->Set("integers", integers_value);

[not at google - send to devlin, 2012/07/18 01:21:35]

ditto inline integers_value

[chebert, 2012/07/19 00:56:01]

Done.

+  value->Set("strings", strings_value);
+
+  scoped_ptr<ChoiceType> out(new ChoiceType);

[not at google - send to devlin, 2012/07/18 01:21:35]

ditto ChoiceType()

[chebert, 2012/07/19 00:56:01]

Done.

+  ASSERT_TRUE(ChoiceType::Populate(*value, out.get()));
+
+  EXPECT_TRUE(value->Equals(out->ToValue().get()));
+}
+
 TEST(JsonSchemaCompilerChoicesTest, ReturnChoices) {
   {
     std::vector<int> integers;
     integers.push_back(1);
     integers.push_back(2);
     scoped_ptr<ListValue> array_results =
         ReturnChoices::Results::Create(integers);
 
     ListValue expected;
     ListValue* expected_argument = new ListValue();
     expected_argument->Append(Value::CreateIntegerValue(1));
     expected_argument->Append(Value::CreateIntegerValue(2));
     expected.Append(expected_argument);
     EXPECT_TRUE(array_results->Equals(&expected));
   }
   {
     scoped_ptr<ListValue> integer_results = ReturnChoices::Results::Create(5);
     ListValue expected;
     expected.Append(Value::CreateIntegerValue(5));
     EXPECT_TRUE(integer_results->Equals(&expected));
   }
 }