maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Fix VS2019 build bots too

This commit is contained in:
Kadir Cetinkaya 2020-04-30 13:57:42 +02:00
parent 96238486ed
commit 932a2b8264
No known key found for this signature in database
GPG Key ID: E39E36B8D2057ED6
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clang-tools-extra/clangd/unittests/FileIndexTests.cpp
View File

@ -573,36 +573,33 @@ TEST(FileShardedIndexTest, Sharding) {
UnorderedElementsAre(AHeaderUri, BHeaderUri, BSourceUri)); UnorderedElementsAre(AHeaderUri, BHeaderUri, BSourceUri));
{ {
auto Shard = ShardedIndex.getShard(AHeaderUri).getValue(); auto Shard = *ShardedIndex.getShard(AHeaderUri);
EXPECT_THAT(Shard.Symbols.getValue(), UnorderedElementsAre(QName("1"))); EXPECT_THAT(*Shard.Symbols, UnorderedElementsAre(QName("1")));
EXPECT_THAT(Shard.Refs.getValue(), IsEmpty()); EXPECT_THAT(*Shard.Refs, IsEmpty());
EXPECT_THAT( EXPECT_THAT(*Shard.Relations, UnorderedElementsAre(Relation{
Shard.Relations.getValue(), Sym1.ID, RelationKind::BaseOf, Sym2.ID}));
UnorderedElementsAre(Relation{Sym1.ID, RelationKind::BaseOf, Sym2.ID})); ASSERT_THAT(Shard.Sources->keys(), UnorderedElementsAre(AHeaderUri));
ASSERT_THAT(Shard.Sources.getValue().keys(),
UnorderedElementsAre(AHeaderUri));
EXPECT_THAT(Shard.Sources->lookup(AHeaderUri).DirectIncludes, IsEmpty()); EXPECT_THAT(Shard.Sources->lookup(AHeaderUri).DirectIncludes, IsEmpty());
EXPECT_TRUE(Shard.Cmd.hasValue()); EXPECT_TRUE(Shard.Cmd.hasValue());
} }
{ {
auto Shard = ShardedIndex.getShard(BHeaderUri).getValue(); auto Shard = *ShardedIndex.getShard(BHeaderUri);
EXPECT_THAT(Shard.Symbols.getValue(), UnorderedElementsAre(QName("2"))); EXPECT_THAT(*Shard.Symbols, UnorderedElementsAre(QName("2")));
EXPECT_THAT(Shard.Refs.getValue(), IsEmpty()); EXPECT_THAT(*Shard.Refs, IsEmpty());
EXPECT_THAT( EXPECT_THAT(*Shard.Relations, UnorderedElementsAre(Relation{
Shard.Relations.getValue(), Sym2.ID, RelationKind::BaseOf, Sym1.ID}));
UnorderedElementsAre(Relation{Sym2.ID, RelationKind::BaseOf, Sym1.ID})); ASSERT_THAT(Shard.Sources->keys(),
ASSERT_THAT(Shard.Sources.getValue().keys(),
UnorderedElementsAre(BHeaderUri, AHeaderUri)); UnorderedElementsAre(BHeaderUri, AHeaderUri));
EXPECT_THAT(Shard.Sources->lookup(BHeaderUri).DirectIncludes, EXPECT_THAT(Shard.Sources->lookup(BHeaderUri).DirectIncludes,
UnorderedElementsAre(AHeaderUri)); UnorderedElementsAre(AHeaderUri));
EXPECT_TRUE(Shard.Cmd.hasValue()); EXPECT_TRUE(Shard.Cmd.hasValue());
} }
{ {
auto Shard = ShardedIndex.getShard(BSourceUri).getValue(); auto Shard = *ShardedIndex.getShard(BSourceUri);
EXPECT_THAT(Shard.Symbols.getValue(), UnorderedElementsAre(QName("2"))); EXPECT_THAT(*Shard.Symbols, UnorderedElementsAre(QName("2")));
EXPECT_THAT(Shard.Refs.getValue(), UnorderedElementsAre(Pair(Sym1.ID, _))); EXPECT_THAT(*Shard.Refs, UnorderedElementsAre(Pair(Sym1.ID, _)));
EXPECT_THAT(Shard.Relations.getValue(), IsEmpty()); EXPECT_THAT(*Shard.Relations, IsEmpty());
ASSERT_THAT(Shard.Sources.getValue().keys(), ASSERT_THAT(Shard.Sources->keys(),
UnorderedElementsAre(BSourceUri, BHeaderUri)); UnorderedElementsAre(BSourceUri, BHeaderUri));
EXPECT_THAT(Shard.Sources->lookup(BSourceUri).DirectIncludes, EXPECT_THAT(Shard.Sources->lookup(BSourceUri).DirectIncludes,
UnorderedElementsAre(BHeaderUri)); UnorderedElementsAre(BHeaderUri));