[MD Settings][Sync Settings] Updates sync status messages

chrome/browser/sync/sync_ui_util_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 <stddef.h>
 
 #include <memory>
 
 #include <set>
 #include "base/macros.h"
@@ skipping 256 matching lines @@
           .WillRepeatedly(Return(false));
       return;
     }
     case STATUS_CASE_PROTOCOL_ERROR: {
       EXPECT_CALL(*service, IsFirstSetupComplete())
           .WillRepeatedly(Return(true));
       EXPECT_CALL(*service, IsSyncActive()).WillRepeatedly(Return(true));
       EXPECT_CALL(*service, IsPassphraseRequired())
           .WillRepeatedly(Return(false));
       syncer::SyncProtocolError protocolError;
-      protocolError.action = syncer::STOP_AND_RESTART_SYNC;
+      protocolError.action = syncer::UPGRADE_CLIENT;
       syncer::SyncBackendHost::Status status;
       status.sync_protocol_error = protocolError;
       EXPECT_CALL(*service, QueryDetailedSyncStatus(_))
           .WillRepeatedly(DoAll(SetArgPointee<0>(status), Return(false)));
       EXPECT_CALL(*service, HasUnrecoverableError())
           .WillRepeatedly(Return(false));
       return;
     }
     case STATUS_CASE_PASSPHRASE_ERROR: {
       EXPECT_CALL(*service, IsFirstSetupComplete())
@@ skipping 56 matching lines @@
     NiceMock<ProfileSyncServiceMock> service(&init_params);
     GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone();
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
     FakeSigninManagerForSyncUIUtilTest signin(profile.get());
     signin.SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
     std::unique_ptr<FakeAuthStatusProvider> provider(new FakeAuthStatusProvider(
         SigninErrorControllerFactory::GetForProfile(profile.get())));
     GetDistinctCase(&service, &signin, provider.get(), idx);
     base::string16 status_label;
     base::string16 link_label;
+    sync_ui_util::ActionType action_type(sync_ui_util::NO_ACTION);
     sync_ui_util::GetStatusLabels(profile.get(), &service, signin,
                                   sync_ui_util::WITH_HTML, &status_label,
-                                  &link_label);
+                                  &link_label, &action_type);
     // If the status and link message combination is already present in the set
     // of messages already seen, this is a duplicate rather than a unique
     // message, and the test has failed.
     EXPECT_FALSE(status_label.empty()) <<
         "Empty status label returned for case #" << idx;
     base::string16 combined_label =
         status_label + base::ASCIIToUTF16("#") + link_label;
     EXPECT_TRUE(messages.find(combined_label) == messages.end()) <<
         "Duplicate message for case #" << idx << ": " << combined_label;
     messages.insert(combined_label);
@@ skipping 15 matching lines @@
     NiceMock<ProfileSyncServiceMock> service(&init_params);
     GoogleServiceAuthError error = GoogleServiceAuthError::AuthErrorNone();
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
     FakeSigninManagerForSyncUIUtilTest signin(profile.get());
     signin.SetAuthenticatedAccountInfo(kTestGaiaId, kTestUser);
     std::unique_ptr<FakeAuthStatusProvider> provider(new FakeAuthStatusProvider(
         SigninErrorControllerFactory::GetForProfile(profile.get())));
     GetDistinctCase(&service, &signin, provider.get(), idx);
     base::string16 status_label;
     base::string16 link_label;
+    sync_ui_util::ActionType action_type(sync_ui_util::NO_ACTION);
     sync_ui_util::GetStatusLabels(profile.get(), &service, signin,
                                   sync_ui_util::PLAIN_TEXT, &status_label,
-                                  &link_label);
+                                  &link_label, &action_type);
 
     // Ensures a search for string 'href' (found in links, not a string to be
     // found in an English language message) fails when links are excluded from
     // the status label.
     EXPECT_FALSE(status_label.empty());
     EXPECT_EQ(status_label.find(base::ASCIIToUTF16("href")),
               base::string16::npos);
     testing::Mock::VerifyAndClearExpectations(&service);
     testing::Mock::VerifyAndClearExpectations(&signin);
     EXPECT_CALL(service, GetAuthError()).WillRepeatedly(ReturnRef(error));
@@ skipping 12 matching lines @@
   EXPECT_CALL(service, IsFirstSetupComplete()).WillRepeatedly(Return(true));
   EXPECT_CALL(service, HasUnrecoverableError()).WillRepeatedly(Return(true));
 
   // First time action is not set. We should get unrecoverable error.
   syncer::SyncStatus status;
   EXPECT_CALL(service, QueryDetailedSyncStatus(_))
       .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));
 
   base::string16 link_label;
   base::string16 unrecoverable_error_status_label;
+  sync_ui_util::ActionType action_type(sync_ui_util::NO_ACTION);
   sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,
                                 sync_ui_util::PLAIN_TEXT,
-                                &unrecoverable_error_status_label, &link_label);
+                                &unrecoverable_error_status_label, &link_label,
+                                &action_type);
+  // Expect the generic unrecoverable error action which is to reauthenticate.
+  EXPECT_EQ(action_type, sync_ui_util::REAUTHENTICATE);
 
   // This time set action to UPGRADE_CLIENT. Ensure that status label differs
   // from previous one.
   status.sync_protocol_error.action = syncer::UPGRADE_CLIENT;
   EXPECT_CALL(service, QueryDetailedSyncStatus(_))
       .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));
   base::string16 upgrade_client_status_label;
   sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,
                                 sync_ui_util::PLAIN_TEXT,
-                                &upgrade_client_status_label, &link_label);
+                                &upgrade_client_status_label, &link_label,
+                                &action_type);
+  // Expect an explicit 'client upgrade' action.
+  EXPECT_EQ(action_type, sync_ui_util::UPGRADE_CLIENT);
+
   EXPECT_NE(unrecoverable_error_status_label, upgrade_client_status_label);
 }
+
+TEST_F(SyncUIUtilTest, ActionableErrorWithPassiveMessage) {
+  std::unique_ptr<Profile> profile(MakeSignedInTestingProfile());
+  SigninManagerBase* signin =
+      SigninManagerFactory::GetForProfile(profile.get());
+
+  ProfileSyncServiceMock service(
+      CreateProfileSyncServiceParamsForTest(profile.get()));
+  EXPECT_CALL(service, IsFirstSetupComplete()).WillRepeatedly(Return(true));
+  EXPECT_CALL(service, HasUnrecoverableError()).WillRepeatedly(Return(true));
+
+  // Set action to UPGRADE_CLIENT.
+  syncer::SyncStatus status;
+  status.sync_protocol_error.action = syncer::UPGRADE_CLIENT;
+  EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+      .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));
+
+  base::string16 first_actionable_error_status_label;
+  base::string16 link_label;
+  sync_ui_util::ActionType action_type(sync_ui_util::NO_ACTION);
+  sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,
+                                sync_ui_util::PLAIN_TEXT,
+                                &first_actionable_error_status_label,
+                                &link_label, &action_type);
+  // Expect a 'client upgrade' call to action.
+  EXPECT_EQ(action_type, sync_ui_util::UPGRADE_CLIENT);
+
+  // This time set action to ENABLE_SYNC_ON_ACCOUNT.
+  status.sync_protocol_error.action = syncer::ENABLE_SYNC_ON_ACCOUNT;
+  EXPECT_CALL(service, QueryDetailedSyncStatus(_))
+      .WillOnce(DoAll(SetArgPointee<0>(status), Return(true)));
+
+  base::string16 second_actionable_error_status_label;
+  action_type = sync_ui_util::NO_ACTION;
+  sync_ui_util::GetStatusLabels(profile.get(), &service, *signin,
+                                sync_ui_util::PLAIN_TEXT,
+                                &second_actionable_error_status_label,
+                                &link_label, &action_type);
+  // Expect a passive message instead of a call to action.
+  EXPECT_EQ(action_type, sync_ui_util::NO_ACTION);
+
+  EXPECT_NE(first_actionable_error_status_label,
+            second_actionable_error_status_label);
+}

[tommycli, 2016/10/28 21:21:09]

nice tests