Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/translate/translate_common_metrics_unittest.cc

Issue 18911002: Move language detection to chrome/common/. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/translate/translate_common_metrics.cc ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/translate/translate_common_metrics_unittest.cc
diff --git a/chrome/renderer/translate/translate_helper_metrics_unittest.cc b/chrome/common/translate/translate_common_metrics_unittest.cc
similarity index 53%
rename from chrome/renderer/translate/translate_helper_metrics_unittest.cc
rename to chrome/common/translate/translate_common_metrics_unittest.cc
index b0d4585ed11c1da749dbd52b48bd59914695ae2b..4815cb1a1855d686c5ad995b5e861831de3589d7 100644
--- a/chrome/renderer/translate/translate_helper_metrics_unittest.cc
+++ b/chrome/common/translate/translate_common_metrics_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/renderer/translate/translate_helper_metrics.h"
+#include "chrome/common/translate/translate_common_metrics.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
@@ -33,23 +33,23 @@ class MetricsRecorder {
base_samples_ = histogram->SnapshotSamples();
}
- void CheckLanguage(TranslateHelperMetrics::MetricsNameIndex index,
+ void CheckLanguage(TranslateCommonMetrics::MetricsNameIndex index,
int expected_not_provided,
int expected_valid,
int expected_invalid) {
- ASSERT_EQ(TranslateHelperMetrics::GetMetricsName(index), key_);
+ ASSERT_EQ(TranslateCommonMetrics::GetMetricsName(index), key_);
Snapshot();
EXPECT_EQ(expected_not_provided,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_NOT_PROVIDED));
+ TranslateCommonMetrics::LANGUAGE_NOT_PROVIDED));
EXPECT_EQ(expected_valid,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VALID));
+ TranslateCommonMetrics::LANGUAGE_VALID));
EXPECT_EQ(expected_invalid,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_INVALID));
+ TranslateCommonMetrics::LANGUAGE_INVALID));
}
void CheckLanguageVerification(int expected_cld_disabled,
@@ -59,54 +59,54 @@ class MetricsRecorder {
int expected_cld_disagree,
int expected_trust_cld,
int expected_cld_complement_sub_code) {
- ASSERT_EQ(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_LANGUAGE_VERIFICATION), key_);
+ ASSERT_EQ(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_LANGUAGE_VERIFICATION), key_);
Snapshot();
EXPECT_EQ(
expected_cld_disabled,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_DISABLED));
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_DISABLED));
EXPECT_EQ(
expected_cld_only,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_ONLY));
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_ONLY));
EXPECT_EQ(
expected_unknown,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_UNKNOWN));
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_UNKNOWN));
EXPECT_EQ(
expected_cld_agree,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_AGREE));
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_AGREE));
EXPECT_EQ(
expected_cld_disagree,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_DISAGREE));
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_DISAGREE));
EXPECT_EQ(
expected_trust_cld,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_TRUST_CLD));
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_TRUST_CLD));
EXPECT_EQ(
expected_cld_complement_sub_code,
GetCountWithoutSnapshot(
- TranslateHelperMetrics::
+ TranslateCommonMetrics::
LANGUAGE_VERIFICATION_CLD_COMPLEMENT_SUB_CODE));
}
void CheckScheme(int expected_http, int expected_https, int expected_others) {
- ASSERT_EQ(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_PAGE_SCHEME), key_);
+ ASSERT_EQ(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_PAGE_SCHEME), key_);
Snapshot();
EXPECT_EQ(expected_http,
- GetCountWithoutSnapshot(TranslateHelperMetrics::SCHEME_HTTP));
+ GetCountWithoutSnapshot(TranslateCommonMetrics::SCHEME_HTTP));
EXPECT_EQ(expected_https,
- GetCountWithoutSnapshot(TranslateHelperMetrics::SCHEME_HTTPS));
+ GetCountWithoutSnapshot(TranslateCommonMetrics::SCHEME_HTTPS));
EXPECT_EQ(expected_others,
- GetCountWithoutSnapshot(TranslateHelperMetrics::SCHEME_OTHERS));
+ GetCountWithoutSnapshot(TranslateCommonMetrics::SCHEME_OTHERS));
}
void CheckTotalCount(int count) {
@@ -170,133 +170,133 @@ class MetricsRecorder {
} // namespace
-TEST(TranslateHelperMetricsTest, ReportContentLanguage) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_CONTENT_LANGUAGE));
-
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 0, 0, 0);
- TranslateHelperMetrics::ReportContentLanguage(std::string(), std::string());
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 1, 0, 0);
- TranslateHelperMetrics::ReportContentLanguage("ja_JP", "ja-JP");
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 1, 0, 1);
- TranslateHelperMetrics::ReportContentLanguage("en", "en");
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_CONTENT_LANGUAGE, 1, 1, 1);
+TEST(TranslateCommonMetricsTest, ReportContentLanguage) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_CONTENT_LANGUAGE));
+
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_CONTENT_LANGUAGE, 0, 0, 0);
+ TranslateCommonMetrics::ReportContentLanguage(std::string(), std::string());
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_CONTENT_LANGUAGE, 1, 0, 0);
+ TranslateCommonMetrics::ReportContentLanguage("ja_JP", "ja-JP");
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_CONTENT_LANGUAGE, 1, 0, 1);
+ TranslateCommonMetrics::ReportContentLanguage("en", "en");
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_CONTENT_LANGUAGE, 1, 1, 1);
}
-TEST(TranslateHelperMetricsTest, ReportHtmlLang) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_HTML_LANG));
-
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 0, 0, 0);
- TranslateHelperMetrics::ReportHtmlLang(std::string(), std::string());
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 1, 0, 0);
- TranslateHelperMetrics::ReportHtmlLang("ja_JP", "ja-JP");
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 1, 0, 1);
- TranslateHelperMetrics::ReportHtmlLang("en", "en");
- recorder.CheckLanguage(TranslateHelperMetrics::UMA_HTML_LANG, 1, 1, 1);
+TEST(TranslateCommonMetricsTest, ReportHtmlLang) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_HTML_LANG));
+
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_HTML_LANG, 0, 0, 0);
+ TranslateCommonMetrics::ReportHtmlLang(std::string(), std::string());
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_HTML_LANG, 1, 0, 0);
+ TranslateCommonMetrics::ReportHtmlLang("ja_JP", "ja-JP");
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_HTML_LANG, 1, 0, 1);
+ TranslateCommonMetrics::ReportHtmlLang("en", "en");
+ recorder.CheckLanguage(TranslateCommonMetrics::UMA_HTML_LANG, 1, 1, 1);
}
-TEST(TranslateHelperMetricsTest, ReportLanguageVerification) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_LANGUAGE_VERIFICATION));
+TEST(TranslateCommonMetricsTest, ReportLanguageVerification) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_LANGUAGE_VERIFICATION));
recorder.CheckLanguageVerification(0, 0, 0, 0, 0, 0, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_DISABLED);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_DISABLED);
recorder.CheckLanguageVerification(1, 0, 0, 0, 0, 0, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_ONLY);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_ONLY);
recorder.CheckLanguageVerification(1, 1, 0, 0, 0, 0, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_UNKNOWN);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_UNKNOWN);
recorder.CheckLanguageVerification(1, 1, 1, 0, 0, 0, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_AGREE);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_AGREE);
recorder.CheckLanguageVerification(1, 1, 1, 1, 0, 0, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_DISAGREE);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_DISAGREE);
recorder.CheckLanguageVerification(1, 1, 1, 1, 1, 0, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_TRUST_CLD);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_TRUST_CLD);
recorder.CheckLanguageVerification(1, 1, 1, 1, 1, 1, 0);
- TranslateHelperMetrics::ReportLanguageVerification(
- TranslateHelperMetrics::LANGUAGE_VERIFICATION_CLD_COMPLEMENT_SUB_CODE);
+ TranslateCommonMetrics::ReportLanguageVerification(
+ TranslateCommonMetrics::LANGUAGE_VERIFICATION_CLD_COMPLEMENT_SUB_CODE);
recorder.CheckLanguageVerification(1, 1, 1, 1, 1, 1, 1);
}
-TEST(TranslateHelperMetricsTest, ReportTimeToBeReady) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_TIME_TO_BE_READY));
+TEST(TranslateCommonMetricsTest, ReportTimeToBeReady) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_TIME_TO_BE_READY));
recorder.CheckTotalCount(0);
- TranslateHelperMetrics::ReportTimeToBeReady(3.14);
+ TranslateCommonMetrics::ReportTimeToBeReady(3.14);
recorder.CheckValueInLogs(3.14);
recorder.CheckTotalCount(1);
}
-TEST(TranslateHelperMetricsTest, ReportTimeToLoad) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_TIME_TO_LOAD));
+TEST(TranslateCommonMetricsTest, ReportTimeToLoad) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_TIME_TO_LOAD));
recorder.CheckTotalCount(0);
- TranslateHelperMetrics::ReportTimeToLoad(573.0);
+ TranslateCommonMetrics::ReportTimeToLoad(573.0);
recorder.CheckValueInLogs(573.0);
recorder.CheckTotalCount(1);
}
-TEST(TranslateHelperMetricsTest, ReportTimeToTranslate) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_TIME_TO_TRANSLATE));
+TEST(TranslateCommonMetricsTest, ReportTimeToTranslate) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_TIME_TO_TRANSLATE));
recorder.CheckTotalCount(0);
- TranslateHelperMetrics::ReportTimeToTranslate(4649.0);
+ TranslateCommonMetrics::ReportTimeToTranslate(4649.0);
recorder.CheckValueInLogs(4649.0);
recorder.CheckTotalCount(1);
}
-TEST(TranslateHelperMetricsTest, ReportUserActionDuration) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_USER_ACTION_DURATION));
+TEST(TranslateCommonMetricsTest, ReportUserActionDuration) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_USER_ACTION_DURATION));
recorder.CheckTotalCount(0);
TimeTicks begin = TimeTicks::Now();
TimeTicks end = begin + base::TimeDelta::FromSeconds(3776);
- TranslateHelperMetrics::ReportUserActionDuration(begin, end);
+ TranslateCommonMetrics::ReportUserActionDuration(begin, end);
recorder.CheckValueInLogs(3776000.0);
recorder.CheckTotalCount(1);
}
-TEST(TranslateHelperMetricsTest, ReportPageScheme) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_PAGE_SCHEME));
+TEST(TranslateCommonMetricsTest, ReportPageScheme) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_PAGE_SCHEME));
recorder.CheckScheme(0, 0, 0);
- TranslateHelperMetrics::ReportPageScheme("http");
+ TranslateCommonMetrics::ReportPageScheme("http");
recorder.CheckScheme(1, 0, 0);
- TranslateHelperMetrics::ReportPageScheme("https");
+ TranslateCommonMetrics::ReportPageScheme("https");
recorder.CheckScheme(1, 1, 0);
- TranslateHelperMetrics::ReportPageScheme("ftp");
+ TranslateCommonMetrics::ReportPageScheme("ftp");
recorder.CheckScheme(1, 1, 1);
}
-TEST(TranslateHelperMetricsTest, ReportSimilarLanguageMatch) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_SIMILAR_LANGUAGE_MATCH));
+TEST(TranslateCommonMetricsTest, ReportSimilarLanguageMatch) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_SIMILAR_LANGUAGE_MATCH));
recorder.CheckTotalCount(0);
EXPECT_EQ(0, recorder.GetCount(kTrue));
EXPECT_EQ(0, recorder.GetCount(kFalse));
- TranslateHelperMetrics::ReportSimilarLanguageMatch(true);
+ TranslateCommonMetrics::ReportSimilarLanguageMatch(true);
EXPECT_EQ(1, recorder.GetCount(kTrue));
EXPECT_EQ(0, recorder.GetCount(kFalse));
- TranslateHelperMetrics::ReportSimilarLanguageMatch(false);
+ TranslateCommonMetrics::ReportSimilarLanguageMatch(false);
EXPECT_EQ(1, recorder.GetCount(kTrue));
EXPECT_EQ(1, recorder.GetCount(kFalse));
}
#if defined(ENABLE_LANGUAGE_DETECTION)
-TEST(TranslateHelperMetricsTest, ReportLanguageDetectionTime) {
- MetricsRecorder recorder(TranslateHelperMetrics::GetMetricsName(
- TranslateHelperMetrics::UMA_LANGUAGE_DETECTION));
+TEST(TranslateCommonMetricsTest, ReportLanguageDetectionTime) {
+ MetricsRecorder recorder(TranslateCommonMetrics::GetMetricsName(
+ TranslateCommonMetrics::UMA_LANGUAGE_DETECTION));
recorder.CheckTotalCount(0);
TimeTicks begin = TimeTicks::Now();
TimeTicks end = begin + base::TimeDelta::FromMicroseconds(9009);
- TranslateHelperMetrics::ReportLanguageDetectionTime(begin, end);
+ TranslateCommonMetrics::ReportLanguageDetectionTime(begin, end);
recorder.CheckValueInLogs(9.009);
recorder.CheckTotalCount(1);
}
« no previous file with comments | « chrome/common/translate/translate_common_metrics.cc ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698