organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-06 14:05:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge 28476008b6 into 52204f78f9

Browse source
This commit is contained in:
Sasha Nik 2025-03-29 21:15:04 +00:00 • committed by GitHub
commit d8d0e01bb9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
googletest/include/gtest/gtest.h
View file

@ -1112,10 +1112,11 @@ class GTEST_API_ TestEventListeners {
// according to their specification.
class GTEST_API_ UnitTest {
public:
friend std::default_delete<UnitTest>;
// Gets the singleton UnitTest object. The first time this method
// is called, a UnitTest object is constructed and returned.
// Consecutive calls will return the same object.
static UnitTest* GetInstance();
static std::unique_ptr<UnitTest>& GetInstance();
// Runs all tests in this UnitTest object and prints the result.
// Returns 0 if successful, or 1 otherwise.

17
googletest/src/gtest.cc
View file

@ -5243,22 +5243,9 @@ void TestEventListeners::SuppressEventForwarding(bool suppress) {
// Gets the singleton UnitTest object. The first time this method is
// called, a UnitTest object is constructed and returned. Consecutive
// calls will return the same object.
//
// We don't protect this under mutex_ as a user is not supposed to
// call this before main() starts, from which point on the return
// value will never change.
UnitTest* UnitTest::GetInstance() {
// CodeGear C++Builder insists on a public destructor for the
// default implementation. Use this implementation to keep good OO
// design with private destructor.
#if defined(__BORLANDC__)
static UnitTest* const instance = new UnitTest;
std::unique_ptr<UnitTest>& UnitTest::GetInstance() {
static std::unique_ptr<UnitTest> instance{ new UnitTest };
return instance;
#else
static UnitTest instance;
return &instance;
#endif // defined(__BORLANDC__)
}
// Gets the number of successful test suites.