diff options
| author | Dominic Sacré <dominic.sacre@gmx.de> | 2018-08-22 14:57:56 (GMT) |
|---|---|---|
| committer | Dominic Sacré <dominic.sacre@gmx.de> | 2018-08-31 12:52:42 (GMT) |
| commit | e41f38b3b7471bab8c43e98372aae78e425cd41a (patch) | |
| tree | 54d88e4fd8937643d08e28118c3979d94b41ee47 | |
| parent | b8e2562086ef326a4a88089f85b29ce7b6f9464b (diff) | |
| download | googletest-e41f38b3b7471bab8c43e98372aae78e425cd41a.zip googletest-e41f38b3b7471bab8c43e98372aae78e425cd41a.tar.gz googletest-e41f38b3b7471bab8c43e98372aae78e425cd41a.tar.bz2 | |
Re-generate gtest-param-test.h from gtest-param-test.h.pump
Commit 6a26e47cfcc174cc85651cbde0b0158d03321e2f changed the formatting
of INSTANTIATE_TEST_CASE_P() in the generated header file only.
This commit reverts to the formatting produced by running "pump
gtest-param-test.h.pump", which seems to be more consistent with the
rest of the file.
| -rw-r--r-- | googletest/include/gtest/gtest-param-test.h | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/googletest/include/gtest/gtest-param-test.h b/googletest/include/gtest/gtest-param-test.h index 1e22f68..3e95e43 100644 --- a/googletest/include/gtest/gtest-param-test.h +++ b/googletest/include/gtest/gtest-param-test.h @@ -37,7 +37,6 @@ // This file is generated by a SCRIPT. DO NOT EDIT BY HAND! // // GOOGLETEST_CM0001 DO NOT DELETE - #ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ #define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ @@ -1411,26 +1410,24 @@ internal::CartesianProductHolder10<Generator1, Generator2, Generator3, // alphanumeric characters or underscore. Because PrintToString adds quotes // to std::string and C strings, it won't work for these types. -#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ - static ::testing::internal::ParamGenerator<test_case_name::ParamType> \ - gtest_##prefix##test_case_name##_EvalGenerator_() { \ - return generator; \ - } \ - static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ - const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \ - return ::testing::internal::GetParamNameGen<test_case_name::ParamType>( \ - __VA_ARGS__)(info); \ - } \ +# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ + static ::testing::internal::ParamGenerator<test_case_name::ParamType> \ + gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \ + static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ + const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \ + return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \ + (__VA_ARGS__)(info); \ + } \ static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ - ::testing::UnitTest::GetInstance() \ - ->parameterized_test_registry() \ - .GetTestCasePatternHolder<test_case_name>( \ - #test_case_name, \ - ::testing::internal::CodeLocation(__FILE__, __LINE__)) \ - ->AddTestCaseInstantiation( \ - #prefix, >est_##prefix##test_case_name##_EvalGenerator_, \ - >est_##prefix##test_case_name##_EvalGenerateName_, __FILE__, \ - __LINE__) + ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ + GetTestCasePatternHolder<test_case_name>(\ + #test_case_name, \ + ::testing::internal::CodeLocation(\ + __FILE__, __LINE__))->AddTestCaseInstantiation(\ + #prefix, \ + >est_##prefix##test_case_name##_EvalGenerator_, \ + >est_##prefix##test_case_name##_EvalGenerateName_, \ + __FILE__, __LINE__) } // namespace testing |