gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3184 from N-Dekker:PrintTo-type_index-overload

Browse Source 
PiperOrigin-RevId: 361175466
This commit is contained in:
Dino Radaković 2021-03-09 10:59:10 -08:00
commit bcfcf75ef6
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
googletest/include/gtest/gtest-printers.h
View File

@ -113,6 +113,11 @@
#include "gtest/internal/gtest-internal.h" #include "gtest/internal/gtest-internal.h"
#include "gtest/internal/gtest-port.h" #include "gtest/internal/gtest-port.h"
#if GTEST_HAS_RTTI
#include <typeindex>
#include <typeinfo>
#endif // GTEST_HAS_RTTI
namespace testing { namespace testing {
// Definitions in the internal* namespaces are subject to change without notice. // Definitions in the internal* namespaces are subject to change without notice.
@ -650,6 +655,18 @@ void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
*os << ')'; *os << ')';
} }
#if GTEST_HAS_RTTI
inline void PrintTo(const ::std::type_info& value, ::std::ostream* os) {
internal::PrintTo<::std::type_info>(value, os);
*os << " (\"" << value.name() << "\")";
}
inline void PrintTo(const ::std::type_index& value, ::std::ostream* os) {
internal::PrintTo<::std::type_index>(value, os);
*os << " (\"" << value.name() << "\")";
}
#endif // GTEST_HAS_RTTI
// Implements printing a non-reference type T by letting the compiler // Implements printing a non-reference type T by letting the compiler
// pick the right overload of PrintTo() for T. // pick the right overload of PrintTo() for T.
template <typename T> template <typename T>

55
googletest/test/googletest-printers-test.cc
View File

@ -1589,6 +1589,61 @@ TEST(PrintToStringTest, WorksForCharArrayWithEmbeddedNul) {
"\n As Text: \"From ä — ẑ\""); "\n As Text: \"From ä — ẑ\"");
} }
#if GTEST_HAS_RTTI
template <typename T>
class PrintToStringTest : public testing::Test {
public:
using TestType = T;
};
struct PrintBase {
virtual ~PrintBase() = default;
};
struct PrintDerived : PrintBase {};
using PrintToStringTestTypes =
testing::Types<void, int, const volatile int*, PrintBase, PrintDerived>;
TYPED_TEST_SUITE(PrintToStringTest, PrintToStringTestTypes);
// Returns `true` if `haystack` contains `needle`.
//
// FIXME: Replace with `EXPECT_THAT(haystack, HasSubstr(needle))` once
// GoogleTest starts depending on GoogleMock.
bool ContainsSubstr(const std::string& haystack, const std::string& needle) {
return haystack.find(needle) != std::string::npos;
}
TYPED_TEST(PrintToStringTest, IncludesNameWithTypeInfoAndTypeIndex) {
const ::std::type_info& info = typeid(typename TestFixture::TestType);
SCOPED_TRACE(info.name());
EXPECT_TRUE(ContainsSubstr(PrintToString(info), info.name()));
EXPECT_TRUE(
ContainsSubstr(PrintToString(::std::type_index{info}), info.name()));
}
TEST(PrintToStringTest, IncludesNameWithTypeInfoAndTypeIndexViaBaseRef) {
PrintDerived derived;
PrintBase& base = derived;
{
const ::std::type_info& derived_info = typeid(derived);
SCOPED_TRACE(derived_info.name());
EXPECT_TRUE(
ContainsSubstr(PrintToString(derived_info), derived_info.name()));
EXPECT_TRUE(ContainsSubstr(PrintToString(::std::type_index{derived_info}),
derived_info.name()));
}
{
const ::std::type_info& base_ref_info = typeid(base);
SCOPED_TRACE(base_ref_info.name());
EXPECT_TRUE(
ContainsSubstr(PrintToString(base_ref_info), base_ref_info.name()));
EXPECT_TRUE(ContainsSubstr(PrintToString(::std::type_index{base_ref_info}),
base_ref_info.name()));
}
}
#endif // GTEST_HAS_RTTI
TEST(IsValidUTF8Test, IllFormedUTF8) { TEST(IsValidUTF8Test, IllFormedUTF8) {
// The following test strings are ill-formed UTF-8 and are printed // The following test strings are ill-formed UTF-8 and are printed
// as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is // as hex only (or ASCII, in case of ASCII bytes) because IsValidUTF8() is