diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-21 14:54:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-21 14:54:14 (GMT) |
| commit | d30a37e743e45de88b85333756bb938d2f6eeecd (patch) | |
| tree | 2835c2b1cd44741fa3fe1dc50a5450e2c95119dd /googletest/test | |
| parent | ff6796877fcbff9982656a0809428ffc7e0490bf (diff) | |
| download | googletest-d30a37e743e45de88b85333756bb938d2f6eeecd.zip googletest-d30a37e743e45de88b85333756bb938d2f6eeecd.tar.gz googletest-d30a37e743e45de88b85333756bb938d2f6eeecd.tar.bz2 | |
Revert "Allow macros inside of parametrized test names."refs/pull/1271/head
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/gtest-param-test_test.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/googletest/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc index 9d6f09f..d1b0644 100644 --- a/googletest/test/gtest-param-test_test.cc +++ b/googletest/test/gtest-param-test_test.cc @@ -809,34 +809,6 @@ TEST_P(NamingTest, TestsReportCorrectNamesAndParameters) { INSTANTIATE_TEST_CASE_P(ZeroToFiveSequence, NamingTest, Range(0, 5)); -// Tests that macros in test names are expanded correctly. -class MacroNamingTest : public TestWithParam<int> {}; - -#define PREFIX_WITH_FOO(test_name) FOO_##test_name -#define PREFIX_WITH_MACRO(test_name) Macro##test_name - -TEST_P(PREFIX_WITH_MACRO(NamingTest), PREFIX_WITH_FOO(SomeTestName)) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - - EXPECT_STREQ("FortyTwo/MacroNamingTest", test_info->test_case_name()); - EXPECT_STREQ("FOO_SomeTestName", test_info->name()); -} - -INSTANTIATE_TEST_CASE_P(FortyTwo, MacroNamingTest, Values(42)); - -// Tests the same thing for non-parametrized tests. -class MacroNamingTestNonParametrized : public ::testing::Test {}; - -TEST_F(PREFIX_WITH_MACRO(NamingTestNonParametrized), - PREFIX_WITH_FOO(SomeTestName)) { - const ::testing::TestInfo* const test_info = - ::testing::UnitTest::GetInstance()->current_test_info(); - - EXPECT_STREQ("MacroNamingTestNonParametrized", test_info->test_case_name()); - EXPECT_STREQ("FOO_SomeTestName", test_info->name()); -} - // Tests that user supplied custom parameter names are working correctly. // Runs the test with a builtin helper method which uses PrintToString, // as well as a custom function and custom functor to ensure all possible |