eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-generate gtest-param-test.h from gtest-param-test.h.pump

Browse Source 
Commit 6a26e47cfc 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.
This commit is contained in:
Dominic Sacré 2018-08-22 16:57:56 +02:00
parent b8e2562086
commit e41f38b3b7
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
googletest/include/gtest/gtest-param-test.h
View File

@ -37,7 +37,6 @@
// This file is generated by a SCRIPT. DO NOT EDIT BY HAND! // This file is generated by a SCRIPT. DO NOT EDIT BY HAND!
// //
// GOOGLETEST_CM0001 DO NOT DELETE // GOOGLETEST_CM0001 DO NOT DELETE
#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_ #ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
#define 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 // alphanumeric characters or underscore. Because PrintToString adds quotes
// to std::string and C strings, it won't work for these types. // to std::string and C strings, it won't work for these types.
#define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \ # define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
static ::testing::internal::ParamGenerator<test_case_name::ParamType> \ static ::testing::internal::ParamGenerator<test_case_name::ParamType> \
gtest_##prefix##test_case_name##_EvalGenerator_() { \ gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
return generator; \ static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
} \ const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
static ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \ return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \
const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \ (__VA_ARGS__)(info); \
return ::testing::internal::GetParamNameGen<test_case_name::ParamType>( \ } \
__VA_ARGS__)(info); \
} \
static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \ static int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
::testing::UnitTest::GetInstance() \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
->parameterized_test_registry() \ GetTestCasePatternHolder<test_case_name>(\
.GetTestCasePatternHolder<test_case_name>( \ #test_case_name, \
#test_case_name, \ ::testing::internal::CodeLocation(\
::testing::internal::CodeLocation(__FILE__, __LINE__)) \ __FILE__, __LINE__))->AddTestCaseInstantiation(\
->AddTestCaseInstantiation( \ #prefix, \
#prefix, &gtest_##prefix##test_case_name##_EvalGenerator_, \ &gtest_##prefix##test_case_name##_EvalGenerator_, \
&gtest_##prefix##test_case_name##_EvalGenerateName_, __FILE__, \ &gtest_##prefix##test_case_name##_EvalGenerateName_, \
__LINE__) __FILE__, __LINE__)
} // namespace testing } // namespace testing