test: Replace _TEST_CASE_ with _TEST_SUITE_ in /ios.

Googletest is (at last) converging with industry-standard terminology
[1]. We previously called test suites "test cases", which was rather
confusing for folks coming from any other testing framework.

Chrome now has a googletest version that supports _TEST_SUITE_ macros
instead of _TEST_CASE_, so this CL cleans up some of the outdated usage.

[1] https://github.com/google/googletest/blob/master/googletest/docs/primer.md#beware-of-the-nomenclature

[email protected]

Bug: 925652
Change-Id: Ia05667d07a48f1e04d69efc683c2e4c5e4826a4b
Reviewed-on: https://chromium-review.googlesource.com/c/1437353
Commit-Queue: Eugene But <[email protected]>
Reviewed-by: Eugene But <[email protected]>
Auto-Submit: Victor Costan <[email protected]>
Cr-Commit-Position: refs/heads/master@{#631793}

Author: pwnall

ios/chrome/app/application_delegate/user_activity_handler_unittest.mm

@@ -705,7 +705,7 @@ conditionBlock getCompletionHandler() {
   EXPECT_FALSE(getHandleStartupParametersHasBeenCalled());
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     ProgrammaticUserActivityHandlerTest,
     UserActivityHandlerTest,
     ::testing::Values(ExternalFilesLoadedInWebStateFeature::Enabled,

ios/chrome/browser/ui/authentication/chrome_signin_view_controller_unittest.mm

@@ -376,9 +376,9 @@ void WaitAndExpectAllStringsOnScreen() {
   FakeChromeSigninViewControllerDelegate* vc_delegate_;
 };
 
-INSTANTIATE_TEST_CASE_P(,
-                        ChromeSigninViewControllerTest,
-                        ::testing::ValuesIn(kUnifiedConsentParam));
+INSTANTIATE_TEST_SUITE_P(,
+                         ChromeSigninViewControllerTest,
+                         ::testing::ValuesIn(kUnifiedConsentParam));
 
 // Tests that all strings on the screen are either part of the consent string
 // list defined in FakeConsentAuditor::ExpectedConsentStringIds()), or are part

ios/chrome/browser/ui/toolbar_container/toolbar_container_view_controller_unittest.mm

@@ -300,7 +300,7 @@ void CheckToolbarFrames() {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(,
-                        ToolbarContainerViewControllerTest,
-                        ::testing::Range(kEmptyConfig,
-                                         kToolbarContainerConfigMax));
+INSTANTIATE_TEST_SUITE_P(,
+                         ToolbarContainerViewControllerTest,
+                         ::testing::Range(kEmptyConfig,
+                                          kToolbarContainerConfigMax));

ios/chrome/browser/voice/voice_search_navigations_tab_helper_unittest.mm

@@ -57,7 +57,7 @@ void SetUp() override {
   EXPECT_FALSE(navigations()->IsExpectingVoiceSearch());
 }
 
-INSTANTIATE_TEST_CASE_P(ProgrammaticVoiceSearchNavigationsTest,
-                        VoiceSearchNavigationsTest,
-                        ::testing::Values(NavigationManagerChoice::LEGACY,
-                                          NavigationManagerChoice::WK_BASED));
+INSTANTIATE_TEST_SUITE_P(ProgrammaticVoiceSearchNavigationsTest,
+                         VoiceSearchNavigationsTest,
+                         ::testing::Values(NavigationManagerChoice::LEGACY,
+                                           NavigationManagerChoice::WK_BASED));

ios/net/cookies/cookie_store_ios_persistent_unittest.mm

@@ -56,18 +56,18 @@
   base::MessageLoop loop_;
 };
 
-INSTANTIATE_TYPED_TEST_CASE_P(PersistentCookieStoreIOS,
-                              CookieStoreTest,
-                              PersistentCookieStoreIOSTestTraits);
-INSTANTIATE_TYPED_TEST_CASE_P(PersistentCookieStoreIOS,
-                              CookieStoreChangeGlobalTest,
-                              PersistentCookieStoreIOSTestTraits);
-INSTANTIATE_TYPED_TEST_CASE_P(PersistentCookieStoreIOS,
-                              CookieStoreChangeUrlTest,
-                              PersistentCookieStoreIOSTestTraits);
-INSTANTIATE_TYPED_TEST_CASE_P(PersistentCookieStoreIOS,
-                              CookieStoreChangeNamedTest,
-                              PersistentCookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(PersistentCookieStoreIOS,
+                               CookieStoreTest,
+                               PersistentCookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(PersistentCookieStoreIOS,
+                               CookieStoreChangeGlobalTest,
+                               PersistentCookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(PersistentCookieStoreIOS,
+                               CookieStoreChangeUrlTest,
+                               PersistentCookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(PersistentCookieStoreIOS,
+                               CookieStoreChangeNamedTest,
+                               PersistentCookieStoreIOSTestTraits);
 
 namespace {
 

ios/net/cookies/cookie_store_ios_unittest.mm

@@ -71,18 +71,18 @@ static void DeliverChangeNotifications() {
   base::MessageLoop loop_;
 };
 
-INSTANTIATE_TYPED_TEST_CASE_P(CookieStoreIOS,
-                              CookieStoreTest,
-                              CookieStoreIOSTestTraits);
-INSTANTIATE_TYPED_TEST_CASE_P(CookieStoreIOS,
-                              CookieStoreChangeGlobalTest,
-                              CookieStoreIOSTestTraits);
-INSTANTIATE_TYPED_TEST_CASE_P(CookieStoreIOS,
-                              CookieStoreChangeUrlTest,
-                              CookieStoreIOSTestTraits);
-INSTANTIATE_TYPED_TEST_CASE_P(CookieStoreIOS,
-                              CookieStoreChangeNamedTest,
-                              CookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(CookieStoreIOS,
+                               CookieStoreTest,
+                               CookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(CookieStoreIOS,
+                               CookieStoreChangeGlobalTest,
+                               CookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(CookieStoreIOS,
+                               CookieStoreChangeUrlTest,
+                               CookieStoreIOSTestTraits);
+INSTANTIATE_TYPED_TEST_SUITE_P(CookieStoreIOS,
+                               CookieStoreChangeNamedTest,
+                               CookieStoreIOSTestTraits);
 
 namespace {
 

ios/net/cookies/ns_http_system_cookie_store_unittest.mm

@@ -63,8 +63,8 @@ void ClearCookies() {
   std::unique_ptr<net::NSHTTPSystemCookieStore> store_;
 };
 
-INSTANTIATE_TYPED_TEST_CASE_P(NSHTTPSystemCookieStore,
-                              SystemCookieStoreTest,
-                              NSHTTPSystemCookieStoreTestDelegate);
+INSTANTIATE_TYPED_TEST_SUITE_P(NSHTTPSystemCookieStore,
+                               SystemCookieStoreTest,
+                               NSHTTPSystemCookieStoreTestDelegate);
 
 }  // namespace net

ios/net/cookies/system_cookie_store_unittest_template.h

@@ -159,7 +159,7 @@ class SystemCookieStoreTest : public PlatformTest {
   SystemCookieStoreTestDelegate delegate_;
 };
 
-TYPED_TEST_CASE_P(SystemCookieStoreTest);
+TYPED_TEST_SUITE_P(SystemCookieStoreTest);
 
 TYPED_TEST_P(SystemCookieStoreTest, SetCookieAsync) {
   if (!this->IsTestEnabled())
@@ -295,12 +295,12 @@ TYPED_TEST_P(SystemCookieStoreTest, GetCookieAcceptPolicy) {
             cookie_store->GetCookieAcceptPolicy());
 }
 
-REGISTER_TYPED_TEST_CASE_P(SystemCookieStoreTest,
-                           SetCookieAsync,
-                           GetCookiesAsync,
-                           DeleteCookiesAsync,
-                           ClearCookiesAsync,
-                           GetCookieAcceptPolicy);
+REGISTER_TYPED_TEST_SUITE_P(SystemCookieStoreTest,
+                            SetCookieAsync,
+                            GetCookiesAsync,
+                            DeleteCookiesAsync,
+                            ClearCookiesAsync,
+                            GetCookieAcceptPolicy);
 
 }  // namespace net
 

ios/web/web_state/ui/crw_web_controller_unittest.mm

@@ -135,8 +135,8 @@ void SetUp() override {
 };
 
 // Macro to simplify instantiation of parameterized tests.
-#define INSTANTIATE_TEST_CASES(cls)                      \
-  INSTANTIATE_TEST_CASE_P(                               \
+#define INSTANTIATE_TEST_SUITES(cls)                     \
+  INSTANTIATE_TEST_SUITE_P(                              \
       Programmatic##cls, cls,                            \
       ::testing::Values(NavigationManagerChoice::LEGACY, \
                         NavigationManagerChoice::WK_BASED));
@@ -329,7 +329,7 @@ GURL native_url(
   }
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerTest);
 
 // Test fixture to test JavaScriptDialogPresenter.
 class JavaScriptDialogPresenterTest : public ProgrammaticWebTestWithWebState {
@@ -421,7 +421,7 @@ void TearDown() override {
   EXPECT_NSEQ(@"No", dialog.default_prompt_text);
 }
 
-INSTANTIATE_TEST_CASES(JavaScriptDialogPresenterTest);
+INSTANTIATE_TEST_SUITES(JavaScriptDialogPresenterTest);
 
 // Test fixture for testing visible security state.
 typedef ProgrammaticWebTestWithWebState CRWWebStateSecurityStateTest;
@@ -439,7 +439,7 @@ void TearDown() override {
             observer.did_change_visible_security_state_info()->web_state);
 }
 
-INSTANTIATE_TEST_CASES(CRWWebStateSecurityStateTest);
+INSTANTIATE_TEST_SUITES(CRWWebStateSecurityStateTest);
 
 // Real WKWebView is required for CRWWebControllerInvalidUrlTest.
 typedef ProgrammaticWebTestWithWebState CRWWebControllerInvalidUrlTest;
@@ -455,7 +455,7 @@ void TearDown() override {
   EXPECT_EQ(url, web_state()->GetLastCommittedURL());
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerInvalidUrlTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerInvalidUrlTest);
 
 // Real WKWebView is required for CRWWebControllerMessageFromIFrame.
 typedef ProgrammaticWebTestWithWebState CRWWebControllerMessageFromIFrame;
@@ -473,7 +473,7 @@ void TearDown() override {
        "frames['f'].__gCrWeb.message.invokeOnHost(bad_message);");
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerMessageFromIFrame);
+INSTANTIATE_TEST_SUITES(CRWWebControllerMessageFromIFrame);
 
 // Real WKWebView is required for CRWWebControllerJSExecutionTest.
 typedef ProgrammaticWebTestWithWebController CRWWebControllerJSExecutionTest;
@@ -500,7 +500,7 @@ void TearDown() override {
   EXPECT_FALSE(ExecuteJavaScript(@"window.test2"));
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerJSExecutionTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerJSExecutionTest);
 
 // Test fixture to test decidePolicyForNavigationResponse:decisionHandler:
 // delegate method.
@@ -748,7 +748,7 @@ bool CallDecidePolicyForNavigationResponseWithResponse(
   EXPECT_EQ(kAbsolute, trust_level);
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerResponseTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerResponseTest);
 
 // Test fixture to test decidePolicyForNavigationAction:decisionHandler:
 // decisionHandler's callback result.
@@ -819,7 +819,7 @@ bool VerifyDecidePolicyForNavigationAction(
       blob_url_request, WKNavigationActionPolicyAllow));
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerPolicyDeciderTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerPolicyDeciderTest);
 
 // Test fixture for testing CRWWebController presenting native content.
 class CRWWebControllerNativeContentTest
@@ -899,7 +899,7 @@ void Load(const GURL& URL) {
             virtual_url);
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerNativeContentTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerNativeContentTest);
 
 // Test fixture for window.open tests.
 class WindowOpenByDomTest : public ProgrammaticWebTestWithWebController {
@@ -989,7 +989,7 @@ id OpenWindowByDom() {
   EXPECT_TRUE(delegate_.popups().empty());
 }
 
-INSTANTIATE_TEST_CASES(WindowOpenByDomTest);
+INSTANTIATE_TEST_SUITES(WindowOpenByDomTest);
 
 // Tests page title changes.
 typedef ProgrammaticWebTestWithWebState CRWWebControllerTitleTest;
@@ -1040,7 +1040,7 @@ id OpenWindowByDom() {
   EXPECT_EQ("Title1", base::UTF16ToUTF8(web_state()->GetTitle()));
 }
 
-INSTANTIATE_TEST_CASES(CRWWebControllerTitleTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerTitleTest);
 
 // Test fixture for JavaScript execution.
 class ScriptExecutionTest : public ProgrammaticWebTestWithWebController {
@@ -1104,7 +1104,7 @@ id ExecuteUserJavaScript(NSString* java_script, NSError** error) {
   EXPECT_FALSE(ExecuteJavaScript(@"window.w"));
 };
 
-INSTANTIATE_TEST_CASES(ScriptExecutionTest);
+INSTANTIATE_TEST_SUITES(ScriptExecutionTest);
 
 // Fixture class to test WKWebView crashes.
 class CRWWebControllerWebProcessTest
@@ -1160,8 +1160,8 @@ void SetUp() override {
   EXPECT_TRUE(web_state()->IsEvicted());
 };
 
-INSTANTIATE_TEST_CASES(CRWWebControllerWebProcessTest);
+INSTANTIATE_TEST_SUITES(CRWWebControllerWebProcessTest);
 
-#undef INSTANTIATE_TEST_CASES
+#undef INSTANTIATE_TEST_SUITES
 
 }  // namespace web