diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2023-06-28 01:13:52 +0200 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2023-06-28 11:29:52 +0200 |
| commit | fe8a168161a3b4c1bbd2d8d916c510cfe4711cbd (patch) | |
| tree | e933e6fba975fc4c81d1e1126d917517a3346fe5 /third-party | |
| parent | 7049393a5865cec0a2ba6aa7ec460ec7ed1398df (diff) | |
| download | llvm-fe8a168161a3b4c1bbd2d8d916c510cfe4711cbd.zip llvm-fe8a168161a3b4c1bbd2d8d916c510cfe4711cbd.tar.gz llvm-fe8a168161a3b4c1bbd2d8d916c510cfe4711cbd.tar.bz2 | |
[unittest] teach gTest to print entries of DenseMap as pairs
When an assertion like the following fails:
EXPECT_THAT(map, ElementsAre(Pair("p", "nullable"))));
Error message before:
Actual: { 40-byte object <E8-A5 9C-7F 25-37 00-00 58-7E 51-51 D0-7F 00-00 00-00 00-00 00-00 00-00 01-00 00-00 00-00 00-00 00-DA C7-7F 25-37 00-00> }
After:
Actual: { ("p", "nonnull") }
It is not ideal that we need to refer directly to DenseMapPair inside the
internal namespace, but I believe the practical maintenance risk is low.
This change is covered by DenseMap's unittests, as we've covered SmallString etc
in the past.
Differential Revision: https://reviews.llvm.org/D153930
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h b/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h index b732092..f279221 100644 --- a/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h +++ b/third-party/unittest/googletest/include/gtest/internal/custom/gtest-printers.h @@ -40,6 +40,7 @@ #define GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_PRINTERS_H_ #if !GTEST_NO_LLVM_SUPPORT +#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" #include <ostream> @@ -63,6 +64,17 @@ inline void PrintTo(const SmallString<N> &S, std::ostream *OS) { inline void PrintTo(const SmallVectorImpl<char> &S, std::ostream *OS) { *OS << ::testing::PrintToString(std::string(S.data(), S.size())); } + +// DenseMap's entries inherit from std::pair, and should act like pairs. +// However gTest's provided `PrintTo(pair<K,V>)` template won't deduce K and V +// because of the needed derived-to-base conversion. +namespace detail { +template <typename K, typename V> +inline void PrintTo(const DenseMapPair<K, V> &Pair, std::ostream *OS) { + *OS << ::testing::PrintToString(static_cast<const std::pair<K, V> &>(Pair)); +} +} // namespace detail + } // namespace llvm #endif // !GTEST_NO_LLVM_SUPPORT |