Translate: split language code typo correction to apply unit tests.

chrome/renderer/translate_helper_browsertest.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 "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/translate_helper.h"
 #include "chrome/test/base/chrome_render_view_test.h"
 #include "content/public/renderer/render_view.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 11 matching lines @@
 
   virtual bool DontDelayTasks() { return true; }
 
   void TranslatePage(int page_id,
                      const std::string& source_lang,
                      const std::string& target_lang,
                      const std::string& translate_script) {
     OnTranslatePage(page_id, translate_script, source_lang, target_lang);
   }
 
+  void CorrectLanguageCodeTypo(std::string* code) {

[MAD, 2013/02/08 13:46:41]

The way typically do this is by making the test a friend of the class (using a
dedicated macro) so it can access protected/private stuff to be tested... 

[Takashi Toyoshima, 2013/02/11 06:59:33]

I see.
I think FRIEND_TEST_ALL_PREFIXES is the macro you mean here.
I'll make another CL which focus on replacing them with the macro.

+    TranslateHelper::CorrectLanguageCodeTypo(code);
+  }
+
   void ConvertLanguageCodeSynonym(std::string* code) {
     TranslateHelper::ConvertLanguageCodeSynonym(code);
   }
 
   MOCK_METHOD0(IsTranslateLibAvailable, bool());
   MOCK_METHOD0(IsTranslateLibReady, bool());
   MOCK_METHOD0(HasTranslationFinished, bool());
   MOCK_METHOD0(HasTranslationFailed, bool());
   MOCK_METHOD0(GetOriginalPageLanguage, std::string());
   MOCK_METHOD0(StartTranslation, bool());
@@ skipping 258 matching lines @@
   ASSERT_TRUE(GetPageTranslatedMessage(&page_id,
                                        &received_original_lang,
                                        &received_target_lang,
                                        &error));
   EXPECT_EQ(view_->GetPageId(), page_id);
   EXPECT_EQ(original_lang, received_original_lang);
   EXPECT_EQ(new_target_lang, received_target_lang);
   EXPECT_EQ(TranslateErrors::NONE, error);
 }
 
+// Tests that well-known language code typos are fixed.
+TEST_F(TranslateHelperTest, LanguageCodeTypoCorrection) {

[sky, 2013/02/11 21:10:14]

Why do you need a browser test to verify CorrectLanguageCodeTypo? Can't this be
a unit test?

[Takashi Toyoshima, 2013/02/12 06:46:02]

Done.

+  std::string language;
+
+  // Strip the second and later codes.
+  language = std::string("ja,en");
+  translate_helper_->CorrectLanguageCodeTypo(&language);
+  EXPECT_EQ(0, language.compare("ja"));
+
+  // Replace dash with hyphen.
+  language = std::string("ja_JP");
+  translate_helper_->CorrectLanguageCodeTypo(&language);
+  EXPECT_EQ(0, language.compare("ja-JP"));
+
+  // Correct wrong cases.
+  language = std::string("JA-jp");
+  translate_helper_->CorrectLanguageCodeTypo(&language);
+  EXPECT_EQ(0, language.compare("ja-JP"));
+}
+
 // Tests that synonym language code is converted to one used in supporting list.
 TEST_F(TranslateHelperTest, LanguageCodeSynonyms) {
   std::string language;
 
   language = std::string("nb");
   translate_helper_->ConvertLanguageCodeSynonym(&language);
   EXPECT_EQ(0, language.compare("no"));
 
   language = std::string("he");
   translate_helper_->ConvertLanguageCodeSynonym(&language);
@@ skipping 144 matching lines @@
 
   GoBack(GetMainFrame()->previousHistoryItem());
 
   message = render_thread_->sink().GetUniqueMessageMatching(
       ChromeViewHostMsg_TranslateLanguageDetermined::ID);
   ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
   ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
   EXPECT_EQ("zh", params.a);
   render_thread_->sink().ClearMessages();
 }