Bump English spellcheck dictionary versions and add tests

chrome/renderer/spellchecker/spellcheck_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 "webkit/glue/webkit_glue.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/platform_file.h"
@@ skipping 340 matching lines @@
     {L"7th", true},
     {L"8th", true},
     {L"9th", true},
     {L"10th", true},
     {L"100th", true},
     {L"1000th", true},
     {L"25", true},
     {L"2012", true},
     {L"100,000,000", true},
     {L"3.141592653", true},
+
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
     size_t input_length = 0;
     if (kTestCases[i].input != NULL) {
       input_length = wcslen(kTestCases[i].input);
     }
     int misspelling_start;
     int misspelling_length;
     bool result = spell_check()->SpellCheckWord(
@@ skipping 709 matching lines @@
     WebKit::WebVector<WebKit::WebTextCheckingResult> textcheck_results;
     spell_check()->CreateTextCheckingResults(
         0, text, spellcheck_results, &textcheck_results);
     EXPECT_EQ(spellcheck_results.size(), textcheck_results.size());
     EXPECT_EQ(WebKit::WebTextCheckingTypeGrammar, textcheck_results[0].type);
     EXPECT_EQ(spellcheck_results[0].location, textcheck_results[0].location);
     EXPECT_EQ(spellcheck_results[0].length, textcheck_results[0].length);
   }
 }
 
+// Checks some words that should be present in all English dictionaries.
+TEST_F(SpellCheckTest, EnglishWords) {
+  static const struct {
+    const char* input;
+    bool should_pass;
+  } kTestCases[] = {
+    // Issue 146093: "Chromebook" and "Chromebox" not included in spell-checking
+    // dictionary.
+    {"Chromebook", true},
+    {"Chromebooks", true},
+    {"Chromebox", true},
+    {"Chromeboxes", true},
+    {"Chromeblade", true},
+    {"Chromeblades", true},
+    {"Chromebase", true},
+    {"Chromebases", true},
+    // Issue 94708: Spell-checker incorrectly reports whisky as misspelled.
+    {"whisky", true},
+    {"whiskey", true},
+    {"whiskies", true},
+    // Issue 98678: "Recency" should be included in client-side dictionary.
+    {"recency", true},
+    {"recencies", false},
+    // Issue 140486
+    {"movie", true},
+    {"movies", true},
+  };
+
+  static const char* kLocales[] = { "en-GB", "en-US", "en-CA", "en-AU" };
+
+  for (size_t j = 0; j < arraysize(kLocales); ++j) {
+    ReinitializeSpellCheck(kLocales[j]);
+    for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestCases); ++i) {
+      size_t input_length = 0;
+      if (kTestCases[i].input != NULL)
+        input_length = strlen(kTestCases[i].input);
+
+      int misspelling_start = 0;
+      int misspelling_length = 0;
+      bool result = spell_check()->SpellCheckWord(
+          ASCIIToUTF16(kTestCases[i].input).c_str(),
+          static_cast<int>(input_length),
+          0,
+          &misspelling_start,
+          &misspelling_length, NULL);
+
+      EXPECT_EQ(kTestCases[i].should_pass, result) << kTestCases[i].input <<
+          " in " << kLocales[j];
+    }
+  }
+}
+
 #endif