Fix a bug with the JSON Schema Compiler where it would stop processing function

parameters after seeing the first optional one.

BUG=120569
TEST=no


Review URL: http://codereview.chromium.org/9837100

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129579 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 34 insertions, 0 deletions

diff --git a/tools/json_schema_compiler/test/simple_api.json b/tools/json_schema_compiler/test/simple_api.json
index b107fab..068432d 100644
--- a/tools/json_schema_compiler/test/simple_api.json
+++ b/tools/json_schema_compiler/test/simple_api.json
@@ -66,6 +66,27 @@
         ]
       },
       {
+        "name": "optionalBeforeRequired",
+        "type": "function",
+        "description": "Takes an optional parameter followed by a required one.",
+        "parameters": [
+          {
+            "name": "first",
+            "type": "string",
+            "optional": true
+          },
+          {
+            "name": "second",
+            "type": "string"
+          },
+          {
+            "name": "callback",
+            "type": "function",
+            "parameters": []
+          }
+        ]
+      },
+      {
         "name": "optionalCallbackParams",
         "type": "function",
         "description": "Gives back a string. Or not.",
diff --git a/tools/json_schema_compiler/test/simple_api_unittest.cc b/tools/json_schema_compiler/test/simple_api_unittest.cc
index 6cc2832..accf32e 100644
--- a/tools/json_schema_compiler/test/simple_api_unittest.cc
+++ b/tools/json_schema_compiler/test/simple_api_unittest.cc
@@ -94,6 +94,19 @@ TEST(JsonSchemaCompilerSimpleTest, OptionalStringParamsWrongType) {
   }
 }
 
+TEST(JsonSchemaCompilerSimpleTest, OptionalBeforeRequired) {
+  {
+    scoped_ptr<ListValue> params_value(new ListValue());
+    params_value->Append(Value::CreateNullValue());
+    params_value->Append(Value::CreateStringValue("asdf"));
+    scoped_ptr<OptionalBeforeRequired::Params> params(
+        OptionalBeforeRequired::Params::Create(*params_value));
+    EXPECT_TRUE(params.get());
+    EXPECT_FALSE(params->first.get());
+    EXPECT_EQ("asdf", params->second);
+  }
+}
+
 TEST(JsonSchemaCompilerSimpleTest, NoParamsResultCreate) {
   scoped_ptr<Value> result(OptionalString::Result::Create());
   scoped_ptr<Value> expected(Value::CreateNullValue());