arichardson created this revision.
arichardson added reviewers: MyDeveloperDay, JakeMerdichAMD, sammccall,
curdeius.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
arichardson requested review of this revision.
Currently a test failure always reports a line number inside verifyFormat()
which is not very helpful to see which test failed. With this change we now
emit the line number where the verify function was called. When using an
IDE such as CLion, the output now includes a clickable link that points to
the call site.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D86926
Files:
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -20,6 +20,7 @@
using clang::tooling::ReplacementTest;
using clang::tooling::toReplacements;
+using testing::internal::ScopedTrace;
namespace clang {
namespace format {
@@ -65,8 +66,10 @@
return getStyleWithColumns(getGoogleStyle(), ColumnLimit);
}
- void verifyFormat(llvm::StringRef Expected, llvm::StringRef Code,
- const FormatStyle &Style = getLLVMStyle()) {
+ void _verifyFormat(const char *File, int Line, llvm::StringRef Expected,
+ llvm::StringRef Code,
+ const FormatStyle &Style = getLLVMStyle()) {
+ ScopedTrace t(File, Line, ::testing::Message() << Code.str());
EXPECT_EQ(Expected.str(), format(Expected, Style))
<< "Expected code is not stable";
EXPECT_EQ(Expected.str(), format(Code, Style));
@@ -79,24 +82,23 @@
}
}
- void verifyFormat(llvm::StringRef Code,
- const FormatStyle &Style = getLLVMStyle()) {
- verifyFormat(Code, test::messUp(Code), Style);
+ void _verifyFormat(const char *File, int Line, llvm::StringRef Code,
+ const FormatStyle &Style = getLLVMStyle()) {
+ _verifyFormat(File, Line, Code, test::messUp(Code), Style);
}
- void verifyIncompleteFormat(llvm::StringRef Code,
- const FormatStyle &Style = getLLVMStyle()) {
+ void _verifyIncompleteFormat(const char *File, int Line, llvm::StringRef
Code,
+ const FormatStyle &Style = getLLVMStyle()) {
+ ScopedTrace t(File, Line, ::testing::Message() << Code.str());
EXPECT_EQ(Code.str(),
format(test::messUp(Code), Style, SC_ExpectIncomplete));
}
- void verifyGoogleFormat(llvm::StringRef Code) {
- verifyFormat(Code, getGoogleStyle());
- }
-
- void verifyIndependentOfContext(llvm::StringRef text) {
- verifyFormat(text);
- verifyFormat(llvm::Twine("void f() { " + text + " }").str());
+ void _verifyIndependentOfContext(const char *File, int Line,
+ llvm::StringRef Text,
+ const FormatStyle &Style = getLLVMStyle()) {
+ _verifyFormat(File, Line, Text, Style);
+ _verifyFormat(File, Line, llvm::Twine("void f() { " + Text + " }").str());
}
/// \brief Verify that clang-format does not crash on the given input.
@@ -108,6 +110,13 @@
int ReplacementCount;
};
+#define verifyIndependentOfContext(...)
\
+ _verifyIndependentOfContext(__FILE__, __LINE__, __VA_ARGS__)
+#define verifyIncompleteFormat(...)
\
+ _verifyIncompleteFormat(__FILE__, __LINE__, __VA_ARGS__)
+#define verifyFormat(...) _verifyFormat(__FILE__, __LINE__, __VA_ARGS__)
+#define verifyGoogleFormat(Code) verifyFormat(Code, getGoogleStyle())
+
TEST_F(FormatTest, MessUp) {
EXPECT_EQ("1 2 3", test::messUp("1 2 3"));
EXPECT_EQ("1 2 3\n", test::messUp("1\n2\n3\n"));
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -20,6 +20,7 @@
using clang::tooling::ReplacementTest;
using clang::tooling::toReplacements;
+using testing::internal::ScopedTrace;
namespace clang {
namespace format {
@@ -65,8 +66,10 @@
return getStyleWithColumns(getGoogleStyle(), ColumnLimit);
}
- void verifyFormat(llvm::StringRef Expected, llvm::StringRef Code,
- const FormatStyle &Style = getLLVMStyle()) {
+ void _verifyFormat(const char *File, int Line, llvm::StringRef Expected,
+ llvm::StringRef Code,
+ const FormatStyle &Style = getLLVMStyle()) {
+ ScopedTrace t(File, Line, ::testing::Message() << Code.str());
EXPECT_EQ(Expected.str(), format(Expected, Style))
<< "Expected code is not stable";
EXPECT_EQ(Expected.str(), format(Code, Style));
@@ -79,24 +82,23 @@
}
}
- void verifyFormat(llvm::StringRef Code,
- const FormatStyle &Style = getLLVMStyle()) {
- verifyFormat(Code, test::messUp(Code), Style);
+ void _verifyFormat(const char *File, int Line, llvm::StringRef Code,
+ const FormatStyle &Style = getLLVMStyle()) {
+ _verifyFormat(File, Line, Code, test::messUp(Code), Style);
}
- void verifyIncompleteFormat(llvm::StringRef Code,
- const FormatStyle &Style = getLLVMStyle()) {
+ void _verifyIncompleteFormat(const char *File, int Line, llvm::StringRef Code,
+ const FormatStyle &Style = getLLVMStyle()) {
+ ScopedTrace t(File, Line, ::testing::Message() << Code.str());
EXPECT_EQ(Code.str(),
format(test::messUp(Code), Style, SC_ExpectIncomplete));
}
- void verifyGoogleFormat(llvm::StringRef Code) {
- verifyFormat(Code, getGoogleStyle());
- }
-
- void verifyIndependentOfContext(llvm::StringRef text) {
- verifyFormat(text);
- verifyFormat(llvm::Twine("void f() { " + text + " }").str());
+ void _verifyIndependentOfContext(const char *File, int Line,
+ llvm::StringRef Text,
+ const FormatStyle &Style = getLLVMStyle()) {
+ _verifyFormat(File, Line, Text, Style);
+ _verifyFormat(File, Line, llvm::Twine("void f() { " + Text + " }").str());
}
/// \brief Verify that clang-format does not crash on the given input.
@@ -108,6 +110,13 @@
int ReplacementCount;
};
+#define verifyIndependentOfContext(...) \
+ _verifyIndependentOfContext(__FILE__, __LINE__, __VA_ARGS__)
+#define verifyIncompleteFormat(...) \
+ _verifyIncompleteFormat(__FILE__, __LINE__, __VA_ARGS__)
+#define verifyFormat(...) _verifyFormat(__FILE__, __LINE__, __VA_ARGS__)
+#define verifyGoogleFormat(Code) verifyFormat(Code, getGoogleStyle())
+
TEST_F(FormatTest, MessUp) {
EXPECT_EQ("1 2 3", test::messUp("1 2 3"));
EXPECT_EQ("1 2 3\n", test::messUp("1\n2\n3\n"));
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
