aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2020-10-03 15:37:51 +0200
committerAvatar Marvin Schmidt <marvin.schmidt1987@gmail.com> 2021-09-20 17:07:47 +0000
commit0e173dcc6c57a3fab3b0d1d9a6946f01ec2cbc05 (patch)
treea03d1265a6ba45cca82420c6c4cf235fcc5e34aa
parentb15c689777a23b5b481b230e937ddda952d5bee6 (diff)
downloadpaludis-0e173dcc6c57a3fab3b0d1d9a6946f01ec2cbc05.tar.gz
paludis-0e173dcc6c57a3fab3b0d1d9a6946f01ec2cbc05.tar.xz
tests: Replace deprecated INSTANTIATE_TEST_CASE_P with INSTANTIATE_TEST_SUITE_P
paludis/repositories/e/e_repository_TEST_pbin.cc:192:1: error: 'InstantiateTestCase_P_IsDeprecated' is deprecated: INSTANTIATE_TEST_CASE_P is deprecated, please use INSTANTIATE_TEST_SUITE_P [clang-diagnostic-deprecated-declarations,-warnings-as-errors] INSTANTIATE_TEST_CASE_P(Works, ERepositoryInstallEAPIPBinTest, testing::Values( ^
-rw-r--r--paludis/filter_TEST.cc2
-rw-r--r--paludis/generator_TEST.cc2
-rw-r--r--paludis/repositories/e/depend_rdepend_TEST.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc2
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc4
-rw-r--r--paludis/repositories/e/vdb_repository_TEST_eapis.cc4
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc8
11 files changed, 16 insertions, 16 deletions
diff --git a/paludis/filter_TEST.cc b/paludis/filter_TEST.cc
index 7de3c4b5b..09e35cd70 100644
--- a/paludis/filter_TEST.cc
+++ b/paludis/filter_TEST.cc
@@ -104,7 +104,7 @@ TEST_P(FilterTestCaseBase, Works)
EXPECT_EQ("", join(indirect_iterator(got_none->begin()), indirect_iterator(got_none->end()), ", "));
}
-INSTANTIATE_TEST_CASE_P(FilterTest, FilterTestCaseBase, testing::Values(
+INSTANTIATE_TEST_SUITE_P(FilterTest, FilterTestCaseBase, testing::Values(
TestInfo{ std::make_shared<filter::All>(), std::string(
"cat/a-1:0::inst_repo1, "
"cat/a-1:0::repo1, "
diff --git a/paludis/generator_TEST.cc b/paludis/generator_TEST.cc
index b94fd81f9..2f8acf531 100644
--- a/paludis/generator_TEST.cc
+++ b/paludis/generator_TEST.cc
@@ -107,7 +107,7 @@ TEST_P(GeneratorTestCaseBase, Works)
EXPECT_EQ("", join(indirect_iterator(got_none->begin()), indirect_iterator(got_none->end()), ", "));
}
-INSTANTIATE_TEST_CASE_P(GeneratorTest, GeneratorTestCaseBase, testing::Values(
+INSTANTIATE_TEST_SUITE_P(GeneratorTest, GeneratorTestCaseBase, testing::Values(
TestInfo{ std::make_shared<generator::All>(), std::string(
"cat/a-1:0::inst_repo1, "
"cat/a-1:0::repo1, "
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index b14274674..a1a384173 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -194,7 +194,7 @@ TEST_P(DependRdependTest, Works)
}
}
-INSTANTIATE_TEST_CASE_P(DependRdepend, DependRdependTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(DependRdepend, DependRdependTest, testing::Values(
TestParams{"0", true},
TestParams{"1", true},
TestParams{"2", true},
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 81740bdfd..8a2e63266 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -141,7 +141,7 @@ TEST_P(EverTest, Works)
id->perform_action(action);
}
-INSTANTIATE_TEST_CASE_P(Works, EverTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, EverTest, testing::Values(
std::string("ever-split"),
std::string("ever-split-all"),
std::string("ever-at-least"),
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index da4cc4072..2896fc32e 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -166,7 +166,7 @@ TEST_P(ExlibsTest, Works)
}
}
-INSTANTIATE_TEST_CASE_P(Works, ExlibsTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, ExlibsTest, testing::Values(
TestInfo{"require-success", success},
TestInfo{"require-fail", unsupported},
TestInfo{"require-param", success},
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index 71edda543..4284e19ed 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -189,7 +189,7 @@ TEST_P(ERepositoryInstallEAPIPBinTest, Works)
EXPECT_TRUE((root / "usr" / "share" / ("installed-" + base_eapi)).stat().exists());
}
-INSTANTIATE_TEST_CASE_P(Works, ERepositoryInstallEAPIPBinTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, ERepositoryInstallEAPIPBinTest, testing::Values(
std::string("0"),
std::string("1"),
std::string("2"),
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index 9c802171e..ee4a740ce 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -159,7 +159,7 @@ TEST_P(PhasesTest, Works)
EXPECT_THROW(id->perform_action(action), ActionFailedError);
}
-INSTANTIATE_TEST_CASE_P(Works, PhasesTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, PhasesTest, testing::Values(
TestInfo{"no-expensive-test", true, false, false},
TestInfo{"expensive-test", true, true, false},
TestInfo{"expensive-test-fail", true, true, false},
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index d974c7759..db48087e0 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -154,7 +154,7 @@ TEST_P(ReplacingTest, Works)
id->perform_action(action);
}
-INSTANTIATE_TEST_CASE_P(Works, ReplacingTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, ReplacingTest, testing::Values(
TestInfo{"exheres-0", "repo1", "replace-none", "cat/none", "pkg"},
TestInfo{"exheres-0", "repo1", "replace-one", "=cat/pkg-1", "pkg"},
TestInfo{"exheres-0", "repo1", "replace-many", "cat/pkg", "pkg"},
diff --git a/paludis/repositories/e/vdb_merger_TEST.cc b/paludis/repositories/e/vdb_merger_TEST.cc
index 0d778a185..ebb91fd16 100644
--- a/paludis/repositories/e/vdb_merger_TEST.cc
+++ b/paludis/repositories/e/vdb_merger_TEST.cc
@@ -196,7 +196,7 @@ TEST_P(VDBMergerTestConfigProtect, ConfigProtect)
EXPECT_TRUE(! (root_dir / "protected_dir_not_really/._cfg0000_unprotected_file").stat().exists());
}
-INSTANTIATE_TEST_CASE_P(ConfigProtect, VDBMergerTestConfigProtect, testing::Values(std::string("config_protect")));
+INSTANTIATE_TEST_SUITE_P(ConfigProtect, VDBMergerTestConfigProtect, testing::Values(std::string("config_protect")));
struct VDBMergerErrorTest : VDBMergerTest { };
@@ -205,7 +205,7 @@ TEST_P(VDBMergerErrorTest, Error)
EXPECT_THROW(merger->check(), FSMergerError);
}
-INSTANTIATE_TEST_CASE_P(Errors, VDBMergerErrorTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Errors, VDBMergerErrorTest, testing::Values(
std::string("dir_newline"),
std::string("sym_newline"),
std::string("sym_target_newline"),
diff --git a/paludis/repositories/e/vdb_repository_TEST_eapis.cc b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
index 9e2448b52..eb405a645 100644
--- a/paludis/repositories/e/vdb_repository_TEST_eapis.cc
+++ b/paludis/repositories/e/vdb_repository_TEST_eapis.cc
@@ -202,7 +202,7 @@ TEST_P(PhasesTest, Works)
}
}
-INSTANTIATE_TEST_CASE_P(Works, PhasesTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, PhasesTest, testing::Values(
std::string("0"),
std::string("1"),
std::string("2"),
@@ -329,7 +329,7 @@ TEST_P(VarsTest, Works)
}
}
-INSTANTIATE_TEST_CASE_P(Works, VarsTest, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Works, VarsTest, testing::Values(
std::string("0"),
std::string("1"),
std::string("2"),
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index e7c165e80..c7a33fc16 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -143,7 +143,7 @@ TEST_P(VDBUnmergerTestRemovesAll, RemovesAll)
ASSERT_TRUE(! (root_dir / target).stat().exists());
}
-INSTANTIATE_TEST_CASE_P(RemovesAll, VDBUnmergerTestRemovesAll, testing::Values(
+INSTANTIATE_TEST_SUITE_P(RemovesAll, VDBUnmergerTestRemovesAll, testing::Values(
std::string("file_ok"),
std::string("file_ with spaces"),
std::string("file_ with lots of spaces"),
@@ -168,7 +168,7 @@ TEST_P(VDBUnmergerTestRemaining, Remaining)
ASSERT_TRUE((root_dir / target).stat().exists());
}
-INSTANTIATE_TEST_CASE_P(Remaining, VDBUnmergerTestRemaining, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Remaining, VDBUnmergerTestRemaining, testing::Values(
std::string("file_bad_type"),
std::string("file_bad_md5sum"),
std::string("file_bad_mtime"),
@@ -191,7 +191,7 @@ TEST_P(VDBUnmergerTestSucceeds, Succeeds)
unmerger->unmerge();
}
-INSTANTIATE_TEST_CASE_P(Succeeds, VDBUnmergerTestSucceeds, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Succeeds, VDBUnmergerTestSucceeds, testing::Values(
std::string("file_replaces_dir")
));
@@ -232,7 +232,7 @@ TEST_P(VDBUnmergerTestConfigProtect, Works)
EXPECT_TRUE(! (root_dir / "protected_dir_not_really/unprotected_file").stat().exists());
}
-INSTANTIATE_TEST_CASE_P(Succeeds, VDBUnmergerTestConfigProtect, testing::Values(
+INSTANTIATE_TEST_SUITE_P(Succeeds, VDBUnmergerTestConfigProtect, testing::Values(
std::string("config_protect")
));