Modified Omnibox extension api to use JSON Schema Compiler

chrome/browser/extensions/api/omnibox/omnibox_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 "base/values.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
+#include "chrome/common/extensions/api/omnibox.h"
+#include "chrome/common/extensions/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace extensions {
 
+namespace omnibox = api::omnibox;
+namespace SendSuggestions = omnibox::SendSuggestions;
+
 namespace {
 
 const int kNone = ACMatchClassification::NONE;
 const int kUrl = ACMatchClassification::URL;
 const int kMatch = ACMatchClassification::MATCH;
 const int kDim = ACMatchClassification::DIM;
 
-void AppendStyle(const std::string& type,
-                 int offset, int length,
-                 ListValue* styles) {
-  DictionaryValue* style = new DictionaryValue;
-  style->SetString("type", type);
-  style->SetInteger("offset", offset);
-  style->SetInteger("length", length);
-  styles->Append(style);
-}
-
 void CompareClassification(const ACMatchClassifications& expected,
                            const ACMatchClassifications& actual) {
   EXPECT_EQ(expected.size(), actual.size());
   for (size_t i = 0; i < expected.size() && i < actual.size(); ++i) {
     EXPECT_EQ(expected[i].offset, actual[i].offset) << "Index:" << i;
     EXPECT_EQ(expected[i].style, actual[i].style) << "Index:" << i;
   }
 }
 
 }  // namespace
 
 // Test output key: n = character with no styling, d = dim, m = match, u = url
 // u = 1, m = 2, d = 4. u+d = 5, etc.
 
 //   0123456789
 //    mmmm
 // +       ddd
 // = nmmmmndddn
 TEST(ExtensionOmniboxTest, DescriptionStylesSimple) {
-  ListValue styles_value;
-  AppendStyle("match", 1, 4, &styles_value);
-  AppendStyle("dim", 6, 3, &styles_value);
+  ListValue* list = ListBuilder().Append(42).Append(ListBuilder().Append(

[not at google - send to devlin, 2013/03/22 17:33:30]

looks like a memory leak? you're releasing this (at the end) but nothing seems
to take ownership of it. leave it as a scoped_ptr here.

[Aaron Jacobs, 2013/03/22 19:54:15]

Done.

+      DictionaryBuilder().Set("content", "content")
+                         .Set("description", "description")
+                         .Set("descriptionStyles", ListBuilder()
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 1)
+                         .Set("length", 4))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 6)
+                         .Set("length", 3))))).Build().release();

[not at google - send to devlin, 2013/03/22 17:33:30]

using some indentation here would be nice to make it a bit easier to follow what
data you're creating.

e.g.

scoped_ptr<ListValue> list = ListBuilder()
    .Append(42)
    .Append(ListBuilder()
      .Append(DictionaryBuilder()
        .Set(content)
        .Set(description)
        .Set(descriptionStyles, ListBuilder()
          .Append(DictionaryBuilder())
            .Set(..)
            .Set(..)


etc.

[Aaron Jacobs, 2013/03/22 19:54:15]

Done.

 
   ACMatchClassifications styles_expected;
   styles_expected.push_back(ACMatchClassification(0, kNone));
   styles_expected.push_back(ACMatchClassification(1, kMatch));
   styles_expected.push_back(ACMatchClassification(5, kNone));
   styles_expected.push_back(ACMatchClassification(6, kDim));
   styles_expected.push_back(ACMatchClassification(9, kNone));
 
-  ExtensionOmniboxSuggestion suggestions;
-  suggestions.description.resize(10);
-  EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
-  CompareClassification(styles_expected, suggestions.description_styles);
+  scoped_ptr<SendSuggestions::Params> params(
+      SendSuggestions::Params::Create(*list));
+  EXPECT_TRUE(params);
+  EXPECT_TRUE(params->suggest_results[0].get());
+  CompareClassification(styles_expected, StyleTypesToACMatchClassifications(
+      *params->suggest_results[0]));
 
   // Same input, but swap the order. Ensure it still works.
-  styles_value.Clear();
-  AppendStyle("dim", 6, 3, &styles_value);
-  AppendStyle("match", 1, 4, &styles_value);
-  EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
-  CompareClassification(styles_expected, suggestions.description_styles);
+  ListValue* swap_list = ListBuilder().Append(42).Append(ListBuilder().Append(

[not at google - send to devlin, 2013/03/22 17:33:30]

same comments

[Aaron Jacobs, 2013/03/22 19:54:15]

Done.

+      DictionaryBuilder().Set("content", "content")
+                         .Set("description", "description")
+                         .Set("descriptionStyles", ListBuilder()
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 6)
+                         .Set("length", 3))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 1)
+                         .Set("length", 4))))).Build().release();
+
+  scoped_ptr<SendSuggestions::Params> swapped_params(
+      SendSuggestions::Params::Create(*swap_list));
+  EXPECT_TRUE(swapped_params);
+  EXPECT_TRUE(swapped_params->suggest_results[0].get());
+  CompareClassification(styles_expected, StyleTypesToACMatchClassifications(
+      *swapped_params->suggest_results[0]));
 }
 
 //   0123456789
 //   uuuuu
 // +          dd
 // +          mm
 // + mmmm
 // +  dd
 // = 3773unnnn66
 TEST(ExtensionOmniboxTest, DescriptionStylesCombine) {
-  ListValue styles_value;
-  AppendStyle("url", 0, 5, &styles_value);
-  AppendStyle("dim", 9, 2, &styles_value);
-  AppendStyle("match", 9, 2, &styles_value);
-  AppendStyle("match", 0, 4, &styles_value);
-  AppendStyle("dim", 1, 2, &styles_value);
+  ListValue* list = ListBuilder().Append(42).Append(ListBuilder().Append(

[not at google - send to devlin, 2013/03/22 17:33:30]

same comments

[Aaron Jacobs, 2013/03/22 19:54:15]

Done.

+      DictionaryBuilder().Set("content", "content")
+                         .Set("description", "description")
+                         .Set("descriptionStyles", ListBuilder()
+                         .Append(DictionaryBuilder()
+                         .Set("type", "url")
+                         .Set("offset", 0)
+                         .Set("length", 5))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 9)
+                         .Set("length", 2))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 9)
+                         .Set("length", 2))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 0)
+                         .Set("length", 4))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 1)
+                         .Set("length", 2))))).Build().release();
 
   ACMatchClassifications styles_expected;
   styles_expected.push_back(ACMatchClassification(0, kUrl | kMatch));
   styles_expected.push_back(ACMatchClassification(1, kUrl | kMatch | kDim));
   styles_expected.push_back(ACMatchClassification(3, kUrl | kMatch));
   styles_expected.push_back(ACMatchClassification(4, kUrl));
   styles_expected.push_back(ACMatchClassification(5, kNone));
   styles_expected.push_back(ACMatchClassification(9, kMatch | kDim));
 
-  ExtensionOmniboxSuggestion suggestions;
-  suggestions.description.resize(10);
-  EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
-  CompareClassification(styles_expected, suggestions.description_styles);
+  scoped_ptr<SendSuggestions::Params> params(
+      SendSuggestions::Params::Create(*list));
+  EXPECT_TRUE(params);
+  EXPECT_TRUE(params->suggest_results[0].get());
+  CompareClassification(styles_expected, StyleTypesToACMatchClassifications(
+      *params->suggest_results[0]));
 
   // Try moving the "dim/match" style pair at offset 9. Output should be the
   // same.
-  styles_value.Clear();
-  AppendStyle("url", 0, 5, &styles_value);
-  AppendStyle("match", 0, 4, &styles_value);
-  AppendStyle("dim", 9, 2, &styles_value);
-  AppendStyle("match", 9, 2, &styles_value);
-  AppendStyle("dim", 1, 2, &styles_value);
-  EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
-  CompareClassification(styles_expected, suggestions.description_styles);
+  ListValue* moved_list = ListBuilder().Append(42).Append(ListBuilder().Append(

[not at google - send to devlin, 2013/03/22 17:33:30]

same comments

[Aaron Jacobs, 2013/03/22 19:54:15]

Done.

+      DictionaryBuilder().Set("content", "content")
+                         .Set("description", "description")
+                         .Set("descriptionStyles", ListBuilder()
+                         .Append(DictionaryBuilder()
+                         .Set("type", "url")
+                         .Set("offset", 0)
+                         .Set("length", 5))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 0)
+                         .Set("length", 4))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 9)
+                         .Set("length", 2))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 9)
+                         .Set("length", 2))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 1)
+                         .Set("length", 2))))).Build().release();
+
+  scoped_ptr<SendSuggestions::Params> moved_params(
+      SendSuggestions::Params::Create(*moved_list));
+  EXPECT_TRUE(moved_params);
+  EXPECT_TRUE(moved_params->suggest_results[0].get());
+  CompareClassification(styles_expected, StyleTypesToACMatchClassifications(
+      *moved_params->suggest_results[0]));
 }
 
 //   0123456789
 //   uuuuu
 // + mmmmm
 // + mmm
 // +   ddd
 // + ddd
 // = 77777nnnnn
 TEST(ExtensionOmniboxTest, DescriptionStylesCombine2) {
-  ListValue styles_value;
-  AppendStyle("url", 0, 5, &styles_value);
-  AppendStyle("match", 0, 5, &styles_value);
-  AppendStyle("match", 0, 3, &styles_value);
-  AppendStyle("dim", 2, 3, &styles_value);
-  AppendStyle("dim", 0, 3, &styles_value);
+  ListValue* list = ListBuilder().Append(42).Append(ListBuilder().Append(

[not at google - send to devlin, 2013/03/22 17:33:30]

same comments

[Aaron Jacobs, 2013/03/22 19:54:15]

Done.

+      DictionaryBuilder().Set("content", "content")
+                         .Set("description", "description")
+                         .Set("descriptionStyles", ListBuilder()
+                         .Append(DictionaryBuilder()
+                         .Set("type", "url")
+                         .Set("offset", 0)
+                         .Set("length", 5))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 0)
+                         .Set("length", 5))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "match")
+                         .Set("offset", 0)
+                         .Set("length", 3))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 2)
+                         .Set("length", 3))
+                         .Append(DictionaryBuilder()
+                         .Set("type", "dim")
+                         .Set("offset", 0)
+                         .Set("length", 3))))).Build().release();
 
   ACMatchClassifications styles_expected;
   styles_expected.push_back(ACMatchClassification(0, kUrl | kMatch | kDim));
   styles_expected.push_back(ACMatchClassification(5, kNone));
 
-  ExtensionOmniboxSuggestion suggestions;
-  suggestions.description.resize(10);
-  EXPECT_TRUE(suggestions.ReadStylesFromValue(styles_value));
-  CompareClassification(styles_expected, suggestions.description_styles);
+  scoped_ptr<SendSuggestions::Params> params(
+      SendSuggestions::Params::Create(*list));
+  EXPECT_TRUE(params);
+  EXPECT_TRUE(params->suggest_results[0].get());
+  CompareClassification(styles_expected, StyleTypesToACMatchClassifications(
+      *params->suggest_results[0]));
 }
 
 }  // namespace extensions