diff options
Diffstat (limited to 'clang-tools-extra/unittests/clang-tidy')
3 files changed, 7 insertions, 5 deletions
diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp b/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp index 4b5dbb2e6ce..621dc5e805f 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp @@ -8,6 +8,8 @@ namespace test { class TestCheck : public ClangTidyCheck { public: + TestCheck(StringRef Name, ClangTidyContext *Context) + : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override { Finder->addMatcher(ast_matchers::varDecl().bind("var"), this); } @@ -23,9 +25,8 @@ TEST(ClangTidyDiagnosticConsumer, SortsErrors) { std::vector<ClangTidyError> Errors; runCheckOnCode<TestCheck>("int a;", &Errors); EXPECT_EQ(2ul, Errors.size()); - // FIXME: Remove " []" once the check name is removed from the message text. - EXPECT_EQ("type specifier []", Errors[0].Message.Message); - EXPECT_EQ("variable []", Errors[1].Message.Message); + EXPECT_EQ("type specifier", Errors[0].Message.Message); + EXPECT_EQ("variable", Errors[1].Message.Message); } TEST(GlobList, Empty) { diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h index ffadc1f00f7..181e6c209e8 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h @@ -44,13 +44,12 @@ std::string runCheckOnCode(StringRef Code, std::vector<ClangTidyError> *Errors = nullptr, const Twine &Filename = "input.cc", ArrayRef<std::string> ExtraArgs = None) { - T Check; ClangTidyOptions Options; Options.Checks = "*"; ClangTidyContext Context(llvm::make_unique<DefaultOptionsProvider>( ClangTidyGlobalOptions(), Options)); ClangTidyDiagnosticConsumer DiagConsumer(Context); - Check.setContext(&Context); + T Check("test-check", &Context); std::vector<std::string> ArgCXX11(1, "-std=c++11"); ArgCXX11.insert(ArgCXX11.end(), ExtraArgs.begin(), ExtraArgs.end()); diff --git a/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp b/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp index 0d43cc933f6..67b3d67de98 100644 --- a/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp +++ b/clang-tools-extra/unittests/clang-tidy/LLVMModuleTest.cpp @@ -95,6 +95,8 @@ static std::string runHeaderGuardCheck(StringRef Code, const Twine &Filename) { namespace { struct WithEndifComment : public LLVMHeaderGuardCheck { + WithEndifComment(StringRef Name, ClangTidyContext *Context) + : LLVMHeaderGuardCheck(Name, Context) {} bool shouldSuggestEndifComment(StringRef Filename) override { return true; } }; } // namespace |
