Googletest export

Correct the spelling of PARAMETERIZED.

PiperOrigin-RevId: 289897278

diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index 5631e8ea5fccbbe126e2d264c0ff43f7e4e39b70..dd28df342c0d6cfaa08e79a09827e9a58767bdbb 100644 (file)
--- a/googletest/docs/advanced.md
+++ b/googletest/docs/advanced.md
@@ -1385,7 +1385,7 @@ cases is dynamic and may be empty, then this check can be suppressed by tagging
 the test suite:
 
 ```c++
-GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(FooTest);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FooTest);
 ```
 
 To distinguish different instances of the pattern (yes, you can instantiate it

diff --git a/googletest/include/gtest/gtest-param-test.h b/googletest/include/gtest/gtest-param-test.h
index 37417a981f85cc485cf78b557e08295251af76ea..5b039df9f6e1cbb0d04d99a35f4dadccebf5e539 100644 (file)
--- a/googletest/include/gtest/gtest-param-test.h
+++ b/googletest/include/gtest/gtest-param-test.h
@@ -493,7 +493,7 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
 
 
 // Allow Marking a Parameterized test class as not needing to be instantiated.
-#define GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(T)                   \
+#define GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(T)                   \
   namespace gtest_do_not_use_outside_namespace_scope {}                   \
   static const ::testing::internal::MarkAsIgnored gtest_allow_ignore_##T( \
       GTEST_STRINGIFY_(T))

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 8e68c04e1d13bd6a658470e0cf271869f09d818a..1f8a68e37e7c7f58f4d22ae008afe71512b413c5 100644 (file)
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -472,7 +472,7 @@ void InsertSyntheticTestCase(const std::string &name, CodeLocation location) {
       "To suppress this error for this test suite, insert the following line "
       "(in a non-header) in the namespace it is defined in:"
       "\n\n"
-      "GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(" + name + ");";
+      "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" + name + ");";
 
   std::string full_name = "UninstantiatedParamaterizedTestSuite<" + name + ">";
   RegisterTest(  //
@@ -533,7 +533,8 @@ void TypeParameterizedTestSuiteRegistry::CheckForInstantiations() {
         "To suppress this error for this test suite, insert the following line "
         "(in a non-header) in the namespace it is definedin in:"
         "\n\n"
-        "GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(" + testcase.first + ");";
+        "GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(" +
+        testcase.first + ");";
 
     std::string full_name =
         "UninstantiatedTypeParamaterizedTestSuite<" + testcase.first + ">";

diff --git a/googletest/test/googletest-output-test-golden-lin.txt b/googletest/test/googletest-output-test-golden-lin.txt
index a4a096e4ac50d9d1f11a508f05b9ad96f7b84fc1..2b34aad39c057f7fce2d3583d39b96fb0e4cd7ea 100644 (file)
--- a/googletest/test/googletest-output-test-golden-lin.txt
+++ b/googletest/test/googletest-output-test-golden-lin.txt
@@ -990,7 +990,7 @@ Ideally, TEST_P definitions should only ever be included as part of binaries tha
 
 To suppress this error for this test suite, insert the following line (in a non-header) in the namespace it is defined in:
 
-GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(DetectNotInstantiatedTest);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTest);
 \e[0;32m[       OK ] \e[mGoogleTestVerification.UninstantiatedParamaterizedTestSuite<DetectNotInstantiatedTest>
 \e[0;32m[ RUN      ] \e[mGoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite<DetectNotInstantiatedTypesTest>
 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.
@@ -999,7 +999,7 @@ Ideally, TYPED_TEST_P definitions should only ever be included as part of binari
 
 To suppress this error for this test suite, insert the following line (in a non-header) in the namespace it is definedin in:
 
-GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(DetectNotInstantiatedTypesTest);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DetectNotInstantiatedTypesTest);
 \e[0;32m[       OK ] \e[mGoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite<DetectNotInstantiatedTypesTest>
 \e[0;32m[----------] \e[mGlobal test environment tear-down
 BarEnvironment::TearDown() called.

diff --git a/googletest/test/googletest-param-test-test.cc b/googletest/test/googletest-param-test-test.cc
index 72a48375cc112cc285dfda0c4db946dbd67ba57e..6ba89654d66fa6e2845991d345aeb80220ccb787 100644 (file)
--- a/googletest/test/googletest-param-test-test.cc
+++ b/googletest/test/googletest-param-test-test.cc
@@ -1081,12 +1081,12 @@ TYPED_TEST_SUITE_P(NotUsedTypeTest);
 // Used but not instantiated, this would fail. but...
 class NotInstantiatedTest : public testing::TestWithParam<int> {};
 // ... we mark is as allowed.
-GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(NotInstantiatedTest);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NotInstantiatedTest);
 
 TEST_P(NotInstantiatedTest, Used) { }
 
 using OtherName = NotInstantiatedTest;
-GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(OtherName);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(OtherName);
 TEST_P(OtherName, Used) { }
 
 // Used but not instantiated, this would fail. but...
@@ -1094,7 +1094,7 @@ template <typename T>
 class NotInstantiatedTypeTest : public testing::Test {};
 TYPED_TEST_SUITE_P(NotInstantiatedTypeTest);
 // ... we mark is as allowed.
-GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST(NotInstantiatedTypeTest);
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(NotInstantiatedTypeTest);
 
 TYPED_TEST_P(NotInstantiatedTypeTest, Used) { }
 REGISTER_TYPED_TEST_SUITE_P(NotInstantiatedTypeTest, Used);