3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2024-12-28 02:53:16 +08:00
Code Issues Projects Releases Wiki Activity

Moves boilerplate disabling copy constructor/assignment from GoogleTest's TEST_P macro into a header file to avoid triggering warnings in user code.

Browse Source 
Fixes #4015

PiperOrigin-RevId: 477513399
Change-Id: Ia21928ee12e85946b4c8db86835d225cb257eecc
This commit is contained in:
Abseil Team 2022-09-28 11:55:06 -07:00 committed by Copybara-Service
parent e23cdb78e9
commit 4924e0610a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,7 +409,7 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
#define TEST_P(test_suite_name, test_name) \
class GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
: public test_suite_name { \
: public ::testing::internal::UserTestSuite<test_suite_name> { \
public: \
GTEST_TEST_CLASS_NAME_(test_suite_name, test_name)() {} \
void TestBody() override; \
@ -429,11 +429,6 @@ internal::CartesianProductHolder<Generator...> Combine(const Generator&... g) {
return 0; \
} \
static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) \
(const GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) &) = delete; \
GTEST_TEST_CLASS_NAME_(test_suite_name, test_name) & operator=( \
const GTEST_TEST_CLASS_NAME_(test_suite_name, \
test_name) &) = delete; /* NOLINT */ \
}; \
int GTEST_TEST_CLASS_NAME_(test_suite_name, \
test_name)::gtest_registering_dummy_ = \

15
googletest/include/gtest/gtest.h
View File

@ -190,6 +190,21 @@ void ReportFailureInUnknownLocation(TestPartResult::Type result_type,
const std::string& message);
std::set<std::string>* GetIgnoredParameterizedTestSuites();
// Mix-in class for user tests.
// This allows us to add/delete members to/from test suites without having to
// modify the test macros themselves.
// This makes the code easier to read and maintain, as well making it easier
// for users to suppress any warnings originating from these members, as the
// members are now declared in an external header instead of in user code.
template <class TestClass>
class UserTestSuite : public TestClass {
public:
UserTestSuite() = default;
UserTestSuite(const UserTestSuite &) = delete;
UserTestSuite &operator=(const UserTestSuite &) = delete;
virtual ~UserTestSuite() = default;
};
} // namespace internal
// The friend relationship of some of these classes is cyclic.