diff options
| author | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:38:29 +0000 |
|---|---|---|
| committer | kinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 06:38:29 +0000 |
| commit | e685143bd7d15b048b7ca9cb4ec0240827842266 (patch) | |
| tree | 74f100269c45c656a554a794d4e63749b91fe026 /components/json_schema/json_schema_validator_unittest.cc | |
| parent | 7a29680b81b983ac1da1b5fdbe3ad096bad7015a (diff) | |
| download | chromium_src-e685143bd7d15b048b7ca9cb4ec0240827842266.zip chromium_src-e685143bd7d15b048b7ca9cb4ec0240827842266.tar.gz chromium_src-e685143bd7d15b048b7ca9cb4ec0240827842266.tar.bz2 | |
Revert 231982 "Docserver: Display enum value descriptions in API..."
"JsonSchemaTest.TestEnum" started failing on Windows bot after this change.
> Docserver: Display enum value descriptions in API docs.
>
> This modifies the json schema to allow both primitive types and
> dictionaries with properties "name" and optional "description" for enum
> values.
>
> BUG=310454
>
> Review URL: https://codereview.chromium.org/39113003
TBR=sammc@chromium.org
Review URL: https://codereview.chromium.org/47403003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/json_schema/json_schema_validator_unittest.cc')
| -rw-r--r-- | components/json_schema/json_schema_validator_unittest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/components/json_schema/json_schema_validator_unittest.cc b/components/json_schema/json_schema_validator_unittest.cc index 6372032..4844ed1 100644 --- a/components/json_schema/json_schema_validator_unittest.cc +++ b/components/json_schema/json_schema_validator_unittest.cc @@ -77,16 +77,10 @@ TEST(JSONSchemaValidator, IsValidSchema) { EXPECT_FALSE(JSONSchemaValidator::IsValidSchema( "{" " \"type\": \"string\"," - " \"enum\": [ {} ]" // "enum" dict values must contain "name". + " \"enum\": [ {} ]," // "enum" must contain simple values. "}", &error)); EXPECT_FALSE(JSONSchemaValidator::IsValidSchema( "{" - " \"type\": \"string\"," - " \"enum\": [ { \"name\": {} } ]" // "enum" name must be a simple value. - "}", - &error)); - EXPECT_FALSE(JSONSchemaValidator::IsValidSchema( - "{" " \"type\": \"array\"," " \"items\": [ 123 ]," // "items" must contain a schema or schemas. "}", &error)); @@ -112,7 +106,7 @@ TEST(JSONSchemaValidator, IsValidSchema) { " }," " \"enum-property\": {" " \"type\": \"integer\"," - " \"enum\": [0, 1, {\"name\": 10}, 100]" + " \"enum\": [0, 1, 10, 100]" " }," " \"items-property\": {" " \"type\": \"array\"," |