aboutsummaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-01-15 14:14:57 -0500
committervslashg <gfalcon@google.com>2020-01-16 13:56:21 -0500
commit8b4817e3df3746a20502a84580f661ac448821be (patch)
treec7988e3b347ad1b1e3f86e62d2afc64e3bf20ba9 /googletest
parent5336106b66db4726174da8c2bdd5d4e80c55897e (diff)
downloadgoogletest-8b4817e3df3746a20502a84580f661ac448821be.tar.gz
googletest-8b4817e3df3746a20502a84580f661ac448821be.tar.bz2
googletest-8b4817e3df3746a20502a84580f661ac448821be.zip
Googletest export
Correct the spelling of PARAMETERIZED. PiperOrigin-RevId: 289897278
Diffstat (limited to 'googletest')
-rw-r--r--googletest/docs/advanced.md2
-rw-r--r--googletest/include/gtest/gtest-param-test.h2
-rw-r--r--googletest/src/gtest.cc5
-rw-r--r--googletest/test/googletest-output-test-golden-lin.txt4
-rw-r--r--googletest/test/googletest-param-test-test.cc6
5 files changed, 10 insertions, 9 deletions
diff --git a/googletest/docs/advanced.md b/googletest/docs/advanced.md
index 5631e8ea..dd28df34 100644
--- 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 37417a98..5b039df9 100644
--- 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 8e68c04e..1f8a68e3 100644
--- 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 a4a096e4..2b34aad3 100644
--- 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);
[ OK ] GoogleTestVerification.UninstantiatedParamaterizedTestSuite<DetectNotInstantiatedTest>
[ RUN ] GoogleTestVerification.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);
[ OK ] GoogleTestVerification.UninstantiatedTypeParamaterizedTestSuite<DetectNotInstantiatedTypesTest>
[----------] Global 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 72a48375..6ba89654 100644
--- 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);