replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[clangd] Fix handling of include paths in windows tests 

llvm-svn: 359079
This commit is contained in:
Kadir Cetinkaya 2019-04-24 09:42:53 +00:00
parent 936c67d3ef
commit 3ba9a43057
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang-tools-extra/unittests/clangd/CodeCompleteTests.cpp
View File

@ -22,6 +22,7 @@
#include "clang/Sema/CodeCompleteConsumer.h"
#include "clang/Tooling/CompilationDatabase.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/Path.h"
#include "llvm/Testing/Support/Error.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
@ -699,11 +700,13 @@ TEST(CompletionTest, DynamicIndexIncludeInsertion) {
Server.addDocument(testPath("foo_impl.cpp"), FileContent);
// Wait for the dynamic index being built.
ASSERT_TRUE(Server.blockUntilIdleForTest());
EXPECT_THAT(
completions(Server, "Foo^ foo;").Completions,
ElementsAre(AllOf(Named("Foo"),
HasInclude('"' + testPath("foo_header.h") + '"'),
InsertInclude())));
EXPECT_THAT(completions(Server, "Foo^ foo;").Completions,
ElementsAre(AllOf(Named("Foo"),
HasInclude('"' +
llvm::sys::path::convert_to_slash(
testPath("foo_header.h")) +
'"'),
InsertInclude())));
}
TEST(CompletionTest, DynamicIndexMultiFile) {

7
clang-tools-extra/unittests/clangd/HeadersTests.cpp
View File

@ -15,6 +15,7 @@
#include "clang/Frontend/CompilerInvocation.h"
#include "clang/Frontend/FrontendActions.h"
#include "clang/Lex/PreprocessorOptions.h"
#include "llvm/Support/Path.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
@ -221,7 +222,8 @@ TEST_F(HeadersTest, ShortenedInclude) {
}
TEST_F(HeadersTest, NotShortenedInclude) {
std::string BarHeader = testPath("sub-2/bar.h");
std::string BarHeader =
llvm::sys::path::convert_to_slash(testPath("sub-2/bar.h"));
EXPECT_EQ(calculate(BarHeader, ""), "\"" + BarHeader + "\"");
}
@ -265,8 +267,7 @@ TEST(Headers, NoHeaderSearchInfo) {
auto Inserting = HeaderFile{HeaderPath, /*Verbatim=*/false};
auto Verbatim = HeaderFile{"<x>", /*Verbatim=*/true};
EXPECT_EQ(Inserter.calculateIncludePath(Inserting),
"\"" + HeaderPath + "\"");
EXPECT_EQ(Inserter.calculateIncludePath(Inserting), "\"" + HeaderPath + "\"");
EXPECT_EQ(Inserter.shouldInsertInclude(HeaderPath, Inserting), false);
EXPECT_EQ(Inserter.calculateIncludePath(Verbatim), "<x>");