diff options
| author | mtytel@chromium.org <mtytel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 02:55:21 +0000 |
|---|---|---|
| committer | mtytel@chromium.org <mtytel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 02:55:21 +0000 |
| commit | 672e3cb3884945949e5cf3eeb1718df590e7418a (patch) | |
| tree | 6ecc55e52576994878b6769750b89fb8d06d2ff2 /tools | |
| parent | d868e6c42abfca5a55321a5d5df72147a0435e7d (diff) | |
| download | chromium_src-672e3cb3884945949e5cf3eeb1718df590e7418a.zip chromium_src-672e3cb3884945949e5cf3eeb1718df590e7418a.tar.gz chromium_src-672e3cb3884945949e5cf3eeb1718df590e7418a.tar.bz2 | |
JSON Schema Compiler now accesses right member variable for an |any| type
when populating.
BUG=122036
TEST=
Review URL: http://codereview.chromium.org/9966006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/json_schema_compiler/any_helper.py | 4 | ||||
| -rw-r--r-- | tools/json_schema_compiler/test/any.json | 2 | ||||
| -rw-r--r-- | tools/json_schema_compiler/test/any_unittest.cc | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/json_schema_compiler/any_helper.py b/tools/json_schema_compiler/any_helper.py index 4502dab..a087ffd 100644 --- a/tools/json_schema_compiler/any_helper.py +++ b/tools/json_schema_compiler/any_helper.py @@ -16,9 +16,9 @@ class AnyHelper(object): dst: Type* """ if any_prop.optional: - return '%s->%s->Init(*%s)' % (dst, any_prop.name, src) + return '%s->%s->Init(*%s)' % (dst, any_prop.unix_name, src) else: - return '%s->%s.Init(*%s)' % (dst, any_prop.name, src) + return '%s->%s.Init(*%s)' % (dst, any_prop.unix_name, src) def GetValue(self, any_prop, var): """Get |var| as a const Value&. diff --git a/tools/json_schema_compiler/test/any.json b/tools/json_schema_compiler/test/any.json index b19db82..02243bb 100644 --- a/tools/json_schema_compiler/test/any.json +++ b/tools/json_schema_compiler/test/any.json @@ -21,7 +21,7 @@ "parameters": [ { "type": "any", - "name": "any", + "name": "anyName", "optional": true }, { diff --git a/tools/json_schema_compiler/test/any_unittest.cc b/tools/json_schema_compiler/test/any_unittest.cc index fc6ae4a..0780230 100644 --- a/tools/json_schema_compiler/test/any_unittest.cc +++ b/tools/json_schema_compiler/test/any_unittest.cc @@ -33,7 +33,7 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) { scoped_ptr<OptionalAny::Params> params( OptionalAny::Params::Create(*params_value)); EXPECT_TRUE(params.get()); - EXPECT_FALSE(params->any.get()); + EXPECT_FALSE(params->any_name.get()); } { scoped_ptr<ListValue> params_value(new ListValue()); @@ -42,8 +42,8 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) { scoped_ptr<OptionalAny::Params> params( OptionalAny::Params::Create(*params_value)); EXPECT_TRUE(params.get()); - EXPECT_TRUE(params->any.get()); - EXPECT_TRUE(params->any->value().Equals(param.get())); + EXPECT_TRUE(params->any_name.get()); + EXPECT_TRUE(params->any_name->value().Equals(param.get())); } { scoped_ptr<ListValue> params_value(new ListValue()); @@ -52,8 +52,8 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) { scoped_ptr<OptionalAny::Params> params( OptionalAny::Params::Create(*params_value)); EXPECT_TRUE(params.get()); - EXPECT_TRUE(params->any.get()); - EXPECT_TRUE(params->any.get()); - EXPECT_TRUE(params->any->value().Equals(param.get())); + EXPECT_TRUE(params->any_name.get()); + EXPECT_TRUE(params->any_name.get()); + EXPECT_TRUE(params->any_name->value().Equals(param.get())); } } |