Skip to content

G
googletest
Commit c6e309b2 by Abseil Team Committed by Andy Getz
Options

Googletest export

gtest.cc: fix a couple typos s/paramaterized/parameterized/ PiperOrigin-RevId: 316878900
parent 549c5d06
Showing with 16 additions and 16 deletions
googletest/src/gtest.cc
...@@ -497,7 +497,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location, ...@@ -497,7 +497,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
"removed but the rest got left behind."; "removed but the rest got left behind.";
std::string message = std::string message =
"Paramaterized test suite " + name + "Parameterized test suite " + name +
(has_test_p ? kMissingInstantiation : kMissingTestCase) + (has_test_p ? kMissingInstantiation : kMissingTestCase) +
"\n\n" "\n\n"
"To suppress this error for this test suite, insert the following line " "To suppress this error for this test suite, insert the following line "
...@@ -505,7 +505,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location, ...@@ -505,7 +505,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location,
"\n\n" "\n\n"
"GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");"; "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");";
std::string full_name = "UninstantiatedParamaterizedTestSuite<" + name + ">"; std::string full_name = "UninstantiatedParameterizedTestSuite<" + name + ">";
RegisterTest( // RegisterTest( //
"GoogleTestVerification", full_name.c_str(), "GoogleTestVerification", full_name.c_str(),
nullptr, // No type parameter. nullptr, // No type parameter.
...@@ -552,7 +552,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() { ...@@ -552,7 +552,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
if (ignored.find(testcase.first) != ignored.end()) continue; if (ignored.find(testcase.first) != ignored.end()) continue;
std::string message = std::string message =
"Type paramaterized test suite " + testcase.first + "Type parameterized test suite " + testcase.first +
" is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated " " is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated "
"via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run." "via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run."
"\n\n" "\n\n"
...@@ -568,7 +568,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() { ...@@ -568,7 +568,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
testcase.first + ");"; testcase.first + ");";
std::string full_name = std::string full_name =
"UninstantiatedTypeParamaterizedTestSuite<" + testcase.first + ">"; "UninstantiatedTypeParameterizedTestSuite<" + testcase.first + ">";
RegisterTest( // RegisterTest( //
"GoogleTestVerification", full_name.c_str(), "GoogleTestVerification", full_name.c_str(),
nullptr, // No type parameter. nullptr, // No type parameter.
......
googletest/test/googletest-output-test-golden-lin.txt
...@@ -983,9 +983,9 @@ Stack trace: (omitted) ...@@ -983,9 +983,9 @@ Stack trace: (omitted)
[ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
[----------] 3 tests from GoogleTestVerification [----------] 3 tests from GoogleTestVerification
[ RUN ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<NoTests> [ RUN ] GoogleTestVerification.UninstantiatedParameterizedTestSuite<NoTests>
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Paramaterized test suite NoTests is instantiated via INSTANTIATE_TEST_SUITE_P, but no tests are defined via TEST_P . No test cases will run. Parameterized test suite NoTests is instantiated via INSTANTIATE_TEST_SUITE_P, but no tests are defined via TEST_P . No test cases will run.
Ideally, INSTANTIATE_TEST_SUITE_P should only ever be invoked from code that always depend on code that provides TEST_P. Failing to do so is often an indication of dead code, e.g. the last TEST_P was removed but the rest got left behind. Ideally, INSTANTIATE_TEST_SUITE_P should only ever be invoked from code that always depend on code that provides TEST_P. Failing to do so is often an indication of dead code, e.g. the last TEST_P was removed but the rest got left behind.
...@@ -994,10 +994,10 @@ To suppress this error for this test suite, insert the following line (in a non- ...@@ -994,10 +994,10 @@ To suppress this error for this test suite, insert the following line (in a non-
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NoTests); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NoTests);
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<NoTests> [ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite<NoTests>
[ RUN ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<DetectNotInstantiatedTest> [ RUN ] GoogleTestVerification.UninstantiatedParameterizedTestSuite<DetectNotInstantiatedTest>
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Paramaterized test suite DetectNotInstantiatedTest is defined via TEST_P, but never instantiated. None of the test cases will run. Either no INSTANTIATE_TEST_SUITE_P is provided or the only ones provided expand to nothing. Parameterized test suite DetectNotInstantiatedTest is defined via TEST_P, but never instantiated. None of the test cases will run. Either no INSTANTIATE_TEST_SUITE_P is provided or the only ones provided expand to nothing.
Ideally, TEST_P definitions should only ever be included as part of binaries that intend to use them. (As opposed to, for example, being placed in a library that may be linked in to get other utilities.) Ideally, TEST_P definitions should only ever be included as part of binaries that intend to use them. (As opposed to, for example, being placed in a library that may be linked in to get other utilities.)
...@@ -1006,10 +1006,10 @@ To suppress this error for this test suite, insert the following line (in a non- ...@@ -1006,10 +1006,10 @@ To suppress this error for this test suite, insert the following line (in a non-
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTest); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTest);
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<DetectNotInstantiatedTest> [ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite<DetectNotInstantiatedTest>
[ RUN ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite<DetectNotInstantiatedTypesTest> [ RUN ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite<DetectNotInstantiatedTypesTest>
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
Type paramaterized test suite DetectNotInstantiatedTypesTest is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run. Type parameterized test suite DetectNotInstantiatedTypesTest is defined via REGISTER_TYPED_TEST_SUITE_P, but never instantiated via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run.
Ideally, TYPED_TEST_P definitions should only ever be included as part of binaries that intend to use them. (As opposed to, for example, being placed in a library that may be linked in to get other utilities.) Ideally, TYPED_TEST_P definitions should only ever be included as part of binaries that intend to use them. (As opposed to, for example, being placed in a library that may be linked in to get other utilities.)
...@@ -1018,7 +1018,7 @@ To suppress this error for this test suite, insert the following line (in a non- ...@@ -1018,7 +1018,7 @@ To suppress this error for this test suite, insert the following line (in a non-
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTypesTest); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTypesTest);
Stack trace: (omitted) Stack trace: (omitted)
[ FAILED ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite<DetectNotInstantiatedTypesTest> [ FAILED ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite<DetectNotInstantiatedTypesTest>
[----------] Global test environment tear-down [----------] Global test environment tear-down
BarEnvironment::TearDown() called. BarEnvironment::TearDown() called.
googletest-output-test_.cc:#: Failure googletest-output-test_.cc:#: Failure
...@@ -1089,9 +1089,9 @@ Stack trace: (omitted) ...@@ -1089,9 +1089,9 @@ Stack trace: (omitted)
[ FAILED ] BadDynamicFixture2.Derived [ FAILED ] BadDynamicFixture2.Derived
[ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 [ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2
[ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a"
[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<NoTests> [ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite<NoTests>
[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<DetectNotInstantiatedTest> [ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite<DetectNotInstantiatedTest>
[ FAILED ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite<DetectNotInstantiatedTypesTest> [ FAILED ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite<DetectNotInstantiatedTypesTest>
57 FAILED TESTS 57 FAILED TESTS
 YOU HAVE 1 DISABLED TEST  YOU HAVE 1 DISABLED TEST
......
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