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

Unified Diff: components/supervised_user_error_page/supervised_user_error_page_unittest.cc

Issue 2479413004: Supervised User interstitial: Update strings to be more child-friendly (Closed)
Patch Set: remove periods, update test Created 4 years, 1 month 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
Index: components/supervised_user_error_page/supervised_user_error_page_unittest.cc
diff --git a/components/supervised_user_error_page/supervised_user_error_page_unittest.cc b/components/supervised_user_error_page/supervised_user_error_page_unittest.cc
index f6b8c391d4244f43e58c3bc1de3b8d1ab68ca73e..ee8ab61f6d348618a73ff83dcb46b874f9df3995 100644
--- a/components/supervised_user_error_page/supervised_user_error_page_unittest.cc
+++ b/components/supervised_user_error_page/supervised_user_error_page_unittest.cc
@@ -99,43 +99,28 @@ TEST_P(SupervisedUserErrorPageTest_BuildHtml, BuildHtml) {
else
#endif
EXPECT_THAT(result, testing::HasSubstr("\"showFeedbackLink\":false"));
+ if (param.is_child_account) {
+ EXPECT_THAT(result, testing::HasSubstr(l10n_util::GetStringUTF8(
+ IDS_CHILD_BLOCK_INTERSTITIAL_HEADER)));
+ } else {
+ EXPECT_THAT(result,
+ testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
+ IDS_CHILD_BLOCK_INTERSTITIAL_HEADER))));
+ }
// Messages containing links aren't tested since they get modified before they
// are added to the result.
if (param.allow_access_requests) {
if (param.is_child_account) {
- if (param.has_two_parents) {
- EXPECT_THAT(result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT))));
- EXPECT_THAT(result,
- testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT)));
- EXPECT_THAT(result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_BLOCK_INTERSTITIAL_MESSAGE))));
- EXPECT_THAT(
- result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED))));
- } else {
- EXPECT_THAT(result,
- testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT)));
- EXPECT_THAT(result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT))));
- EXPECT_THAT(
- result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED))));
- }
+ EXPECT_THAT(result, testing::HasSubstr(l10n_util::GetStringUTF8(
+ IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE)));
+ EXPECT_THAT(
+ result,
+ testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
+ IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED))));
} else {
EXPECT_THAT(result,
testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT))));
- EXPECT_THAT(result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT))));
+ IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE))));
EXPECT_THAT(
result,
testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
@@ -144,10 +129,7 @@ TEST_P(SupervisedUserErrorPageTest_BuildHtml, BuildHtml) {
} else {
EXPECT_THAT(result,
testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_SINGLE_PARENT))));
- EXPECT_THAT(result,
- testing::Not(testing::HasSubstr(l10n_util::GetStringUTF8(
- IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE_MULTI_PARENT))));
+ IDS_CHILD_BLOCK_INTERSTITIAL_MESSAGE))));
EXPECT_THAT(result,
testing::HasSubstr(l10n_util::GetStringUTF8(
IDS_BLOCK_INTERSTITIAL_MESSAGE_ACCESS_REQUESTS_DISABLED)));

Powered by Google App Engine
This is Rietveld 408576698