From c6e309b268d4fb9138bed7d0f56b7709c29f102f Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 17 Jun 2020 09:49:33 -0400 Subject: [PATCH] Googletest export gtest.cc: fix a couple typos s/paramaterized/parameterized/ PiperOrigin-RevId: 316878900 --- googletest/src/gtest.cc | 8 +++---- .../googletest-output-test-golden-lin.txt | 24 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 2e79ea1f..937556ba 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -497,7 +497,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location, "removed but the rest got left behind."; std::string message = - "Paramaterized test suite " + name + + "Parameterized test suite " + name + (has_test_p ? kMissingInstantiation : kMissingTestCase) + "\n\n" "To suppress this error for this test suite, insert the following line " @@ -505,7 +505,7 @@ void InsertSyntheticTestCase(const std::string& name, CodeLocation location, "\n\n" "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");"; - std::string full_name = "UninstantiatedParamaterizedTestSuite<" + name + ">"; + std::string full_name = "UninstantiatedParameterizedTestSuite<" + name + ">"; RegisterTest( // "GoogleTestVerification", full_name.c_str(), nullptr, // No type parameter. @@ -552,7 +552,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() { if (ignored.find(testcase.first) != ignored.end()) continue; 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 " "via INSTANTIATE_TYPED_TEST_SUITE_P. None of the test cases will run." "\n\n" @@ -568,7 +568,7 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() { testcase.first + ");"; std::string full_name = - "UninstantiatedTypeParamaterizedTestSuite<" + testcase.first + ">"; + "UninstantiatedTypeParameterizedTestSuite<" + testcase.first + ">"; RegisterTest( // "GoogleTestVerification", full_name.c_str(), nullptr, // No type parameter. diff --git a/googletest/test/googletest-output-test-golden-lin.txt b/googletest/test/googletest-output-test-golden-lin.txt index 85debe85..9ad927d5 100644 --- a/googletest/test/googletest-output-test-golden-lin.txt +++ b/googletest/test/googletest-output-test-golden-lin.txt @@ -983,9 +983,9 @@ Stack trace: (omitted) [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" [----------] 3 tests from GoogleTestVerification -[ RUN ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite +[ RUN ] GoogleTestVerification.UninstantiatedParameterizedTestSuite 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. @@ -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); Stack trace: (omitted) -[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite -[ RUN ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite +[ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite +[ RUN ] GoogleTestVerification.UninstantiatedParameterizedTestSuite 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.) @@ -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); Stack trace: (omitted) -[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite -[ RUN ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite +[ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite +[ RUN ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite 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.) @@ -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); Stack trace: (omitted) -[ FAILED ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite +[ FAILED ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite [----------] Global test environment tear-down BarEnvironment::TearDown() called. googletest-output-test_.cc:#: Failure @@ -1089,9 +1089,9 @@ Stack trace: (omitted) [ FAILED ] BadDynamicFixture2.Derived [ FAILED ] PrintingFailingParams/FailingParamTest.Fails/0, where GetParam() = 2 [ FAILED ] PrintingStrings/ParamTest.Failure/a, where GetParam() = "a" -[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite -[ FAILED ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite -[ FAILED ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite +[ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite +[ FAILED ] GoogleTestVerification.UninstantiatedParameterizedTestSuite +[ FAILED ] GoogleTestVerification.UninstantiatedTypeParameterizedTestSuite 57 FAILED TESTS  YOU HAVE 1 DISABLED TEST