From 11b06242a7e554f489c10bc9613be3e3c9e0c70a Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Wed, 17 Jul 2019 10:17:47 +0000 Subject: [PATCH] [clangd] Fix error message in tweaktests to be useful. NFC llvm-svn: 366311 --- clang-tools-extra/clangd/unittests/TweakTests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clang-tools-extra/clangd/unittests/TweakTests.cpp b/clang-tools-extra/clangd/unittests/TweakTests.cpp index 7a0d88405b4f..69f74e9d41b9 100644 --- a/clang-tools-extra/clangd/unittests/TweakTests.cpp +++ b/clang-tools-extra/clangd/unittests/TweakTests.cpp @@ -17,6 +17,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/Error.h" #include "llvm/Testing/Support/Error.h" +#include "gmock/gmock-matchers.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include @@ -134,10 +135,9 @@ void checkApplyContainsError(llvm::StringRef ID, llvm::StringRef Input, auto Result = apply(ID, Input); ASSERT_FALSE(Result) << "expected error message:\n " << ErrorMessage << "\non input:" << Input; - EXPECT_NE(std::string::npos, - llvm::toString(Result.takeError()).find(ErrorMessage)) - << "Wrong error message:\n " << llvm::toString(Result.takeError()) - << "\nexpected:\n " << ErrorMessage; + EXPECT_THAT(llvm::toString(Result.takeError()), + testing::HasSubstr(ErrorMessage)) + << Input; } TEST(TweakTest, SwapIfBranches) {