Commit 58601a48 authored by Ilia Samsonov's avatar Ilia Samsonov Committed by Commit Bot

Add prefix to empty param tests.

googletest will no longer support empty prefix
for parameterized INSTANTIATE_TEST_SUITE_P.
Adding "All" prefix to existing empty prefix test suites.

This CL was uploaded by git cl split.

R=khmel@chromium.org

Bug: 1023677
Change-Id: Ieabfcdac4097b9cf9839dc3e05bc950b328b989a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1926670
Auto-Submit: Ilia Samsonov <isamsonov@google.com>
Reviewed-by: default avatarYury Khmel <khmel@chromium.org>
Commit-Queue: Ilia Samsonov <isamsonov@google.com>
Cr-Commit-Position: refs/heads/master@{#718712}
parent fa6dda8c
...@@ -2967,24 +2967,24 @@ TEST_P(ArcDefaultAppForManagedUserTest, DefaultAppsForManagedUser) { ...@@ -2967,24 +2967,24 @@ TEST_P(ArcDefaultAppForManagedUserTest, DefaultAppsForManagedUser) {
} }
} }
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcAppModelBuilderTest, ArcAppModelBuilderTest,
::testing::ValuesIn(kUnmanagedArcStates)); ::testing::ValuesIn(kUnmanagedArcStates));
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcDefaultAppTest, ArcDefaultAppTest,
::testing::ValuesIn(kUnmanagedArcStates)); ::testing::ValuesIn(kUnmanagedArcStates));
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcAppLauncherForDefaultAppTest, ArcAppLauncherForDefaultAppTest,
::testing::ValuesIn(kUnmanagedArcStates)); ::testing::ValuesIn(kUnmanagedArcStates));
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcDefaultAppForManagedUserTest, ArcDefaultAppForManagedUserTest,
::testing::ValuesIn(kManagedArcStates)); ::testing::ValuesIn(kManagedArcStates));
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcPlayStoreAppTest, ArcPlayStoreAppTest,
::testing::ValuesIn(kUnmanagedArcStates)); ::testing::ValuesIn(kUnmanagedArcStates));
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcAppModelBuilderRecreate, ArcAppModelBuilderRecreate,
::testing::ValuesIn(kUnmanagedArcStates)); ::testing::ValuesIn(kUnmanagedArcStates));
INSTANTIATE_TEST_SUITE_P(, INSTANTIATE_TEST_SUITE_P(All,
ArcAppModelIconTest, ArcAppModelIconTest,
::testing::ValuesIn(kUnmanagedArcStates)); ::testing::ValuesIn(kUnmanagedArcStates));
...@@ -112,6 +112,8 @@ TEST_P(ArcAppShortcutsSearchProviderTest, Basic) { ...@@ -112,6 +112,8 @@ TEST_P(ArcAppShortcutsSearchProviderTest, Basic) {
} }
} }
INSTANTIATE_TEST_SUITE_P(, ArcAppShortcutsSearchProviderTest, testing::Bool()); INSTANTIATE_TEST_SUITE_P(All,
ArcAppShortcutsSearchProviderTest,
testing::Bool());
} // namespace app_list } // namespace app_list
...@@ -21,7 +21,7 @@ namespace app_list { ...@@ -21,7 +21,7 @@ namespace app_list {
class AppListFileIconUtilTest class AppListFileIconUtilTest
: public testing::TestWithParam<std::pair<std::string, int>> {}; : public testing::TestWithParam<std::pair<std::string, int>> {};
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
, All,
AppListFileIconUtilTest, AppListFileIconUtilTest,
testing::ValuesIn((std::pair<std::string, int>[]){ testing::ValuesIn((std::pair<std::string, int>[]){
{"/my/test/file.pdf", IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PDF}, {"/my/test/file.pdf", IDR_FILE_MANAGER_IMG_LAUNCHER_FILETYPE_2X_PDF},
......
...@@ -936,7 +936,7 @@ TEST_P(AppSearchProviderWithExtensionInstallType, OemResultsOnFirstBoot) { ...@@ -936,7 +936,7 @@ TEST_P(AppSearchProviderWithExtensionInstallType, OemResultsOnFirstBoot) {
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
, All,
AppSearchProviderWithExtensionInstallType, AppSearchProviderWithExtensionInstallType,
::testing::ValuesIn({TestExtensionInstallType::CONTROLLED_BY_POLICY, ::testing::ValuesIn({TestExtensionInstallType::CONTROLLED_BY_POLICY,
TestExtensionInstallType::CHROME_COMPONENT, TestExtensionInstallType::CHROME_COMPONENT,
...@@ -1027,7 +1027,7 @@ TEST_P(AppSearchProviderWithArcAppInstallType, ...@@ -1027,7 +1027,7 @@ TEST_P(AppSearchProviderWithArcAppInstallType,
} }
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
, All,
AppSearchProviderWithArcAppInstallType, AppSearchProviderWithArcAppInstallType,
::testing::ValuesIn({TestArcAppInstallType::CONTROLLED_BY_POLICY, ::testing::ValuesIn({TestArcAppInstallType::CONTROLLED_BY_POLICY,
TestArcAppInstallType::INSTALLED_BY_DEFAULT})); TestArcAppInstallType::INSTALLED_BY_DEFAULT}));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment