malaperle created this revision.
Herald added subscribers: cfe-commits, jkorous, MaskRay, ioeric, ilya-biryukov.
Instead of checking symbol name and container (scope) separately, check the
qualified name instead. This is much shorter and similar to how it is done
in the SymbolCollector tests.
Signed-off-by: Marc-Andre Laperle <[email protected]>
Repository:
rCTE Clang Tools Extra
https://reviews.llvm.org/D47847
Files:
unittests/clangd/FindSymbolsTests.cpp
Index: unittests/clangd/FindSymbolsTests.cpp
===================================================================
--- unittests/clangd/FindSymbolsTests.cpp
+++ unittests/clangd/FindSymbolsTests.cpp
@@ -31,9 +31,10 @@
};
// GMock helpers for matching SymbolInfos items.
-MATCHER_P(Named, Name, "") { return arg.name == Name; }
-MATCHER_P(InContainer, ContainerName, "") {
- return arg.containerName == ContainerName;
+MATCHER_P(QName, Name, "") {
+ if (arg.containerName.empty())
+ return arg.name == Name;
+ return (arg.containerName + "::" + arg.name) == Name;
}
MATCHER_P(WithKind, Kind, "") { return arg.kind == Kind; }
@@ -101,12 +102,10 @@
#include "foo.h"
)cpp");
EXPECT_THAT(getSymbols("global"),
- UnorderedElementsAre(AllOf(Named("GlobalStruct"), InContainer(""),
- WithKind(SymbolKind::Struct)),
- AllOf(Named("global_func"), InContainer(""),
- WithKind(SymbolKind::Function)),
- AllOf(Named("global_var"), InContainer(""),
- WithKind(SymbolKind::Variable))));
+ UnorderedElementsAre(
+ AllOf(QName("GlobalStruct"), WithKind(SymbolKind::Struct)),
+ AllOf(QName("global_func"), WithKind(SymbolKind::Function)),
+ AllOf(QName("global_var"), WithKind(SymbolKind::Variable))));
}
TEST_F(WorkspaceSymbolsTest, Unnamed) {
@@ -118,12 +117,11 @@
#include "foo.h"
)cpp");
EXPECT_THAT(getSymbols("UnnamedStruct"),
- ElementsAre(AllOf(Named("UnnamedStruct"),
+ ElementsAre(AllOf(QName("UnnamedStruct"),
WithKind(SymbolKind::Variable))));
- EXPECT_THAT(
- getSymbols("InUnnamed"),
- ElementsAre(AllOf(Named("InUnnamed"), InContainer("(anonymous struct)"),
- WithKind(SymbolKind::Field))));
+ EXPECT_THAT(getSymbols("InUnnamed"),
+ ElementsAre(AllOf(QName("(anonymous struct)::InUnnamed"),
+ WithKind(SymbolKind::Field))));
}
TEST_F(WorkspaceSymbolsTest, InMainFile) {
@@ -146,28 +144,20 @@
addFile("foo.cpp", R"cpp(
#include "foo.h"
)cpp");
- EXPECT_THAT(
- getSymbols("a"),
- UnorderedElementsAre(AllOf(Named("ans1"), InContainer("")),
- AllOf(Named("ai1"), InContainer("ans1")),
- AllOf(Named("ans2"), InContainer("ans1")),
- AllOf(Named("ai2"), InContainer("ans1::ans2"))));
- EXPECT_THAT(getSymbols("::"),
- ElementsAre(AllOf(Named("ans1"), InContainer(""))));
- EXPECT_THAT(getSymbols("::a"),
- ElementsAre(AllOf(Named("ans1"), InContainer(""))));
+ EXPECT_THAT(getSymbols("a"),
+ UnorderedElementsAre(QName("ans1"), QName("ans1::ai1"),
+ QName("ans1::ans2"),
+ QName("ans1::ans2::ai2")));
+ EXPECT_THAT(getSymbols("::"), ElementsAre(QName("ans1")));
+ EXPECT_THAT(getSymbols("::a"), ElementsAre(QName("ans1")));
EXPECT_THAT(getSymbols("ans1::"),
- UnorderedElementsAre(AllOf(Named("ai1"), InContainer("ans1")),
- AllOf(Named("ans2"), InContainer("ans1"))));
- EXPECT_THAT(getSymbols("::ans1"),
- ElementsAre(AllOf(Named("ans1"), InContainer(""))));
+ UnorderedElementsAre(QName("ans1::ai1"), QName("ans1::ans2")));
+ EXPECT_THAT(getSymbols("::ans1"), ElementsAre(QName("ans1")));
EXPECT_THAT(getSymbols("::ans1::"),
- UnorderedElementsAre(AllOf(Named("ai1"), InContainer("ans1")),
- AllOf(Named("ans2"), InContainer("ans1"))));
- EXPECT_THAT(getSymbols("::ans1::ans2"),
- ElementsAre(AllOf(Named("ans2"), InContainer("ans1"))));
+ UnorderedElementsAre(QName("ans1::ai1"), QName("ans1::ans2")));
+ EXPECT_THAT(getSymbols("::ans1::ans2"), ElementsAre(QName("ans1::ans2")));
EXPECT_THAT(getSymbols("::ans1::ans2::"),
- ElementsAre(AllOf(Named("ai2"), InContainer("ans1::ans2"))));
+ ElementsAre(QName("ans1::ans2::ai2")));
}
TEST_F(WorkspaceSymbolsTest, AnonymousNamespace) {
@@ -196,8 +186,7 @@
#include "foo2.h"
)cpp");
EXPECT_THAT(getSymbols("foo"),
- UnorderedElementsAre(AllOf(Named("foo"), InContainer("")),
- AllOf(Named("foo2"), InContainer(""))));
+ UnorderedElementsAre(QName("foo"), QName("foo2")));
}
TEST_F(WorkspaceSymbolsTest, GlobalNamespaceQueries) {
@@ -215,13 +204,11 @@
addFile("foo.cpp", R"cpp(
#include "foo.h"
)cpp");
- EXPECT_THAT(
- getSymbols("::"),
- UnorderedElementsAre(
- AllOf(Named("Foo"), InContainer(""), WithKind(SymbolKind::Class)),
- AllOf(Named("foo"), InContainer(""), WithKind(SymbolKind::Function)),
- AllOf(Named("ns"), InContainer(""),
- WithKind(SymbolKind::Namespace))));
+ EXPECT_THAT(getSymbols("::"),
+ UnorderedElementsAre(
+ AllOf(QName("Foo"), WithKind(SymbolKind::Class)),
+ AllOf(QName("foo"), WithKind(SymbolKind::Function)),
+ AllOf(QName("ns"), WithKind(SymbolKind::Namespace))));
EXPECT_THAT(getSymbols(":"), IsEmpty());
EXPECT_THAT(getSymbols(""), IsEmpty());
}
@@ -252,16 +239,18 @@
addFile("foo.cpp", R"cpp(
#include "foo.h"
)cpp");
- EXPECT_THAT(getSymbols("Red"), ElementsAre(Named("Red")));
- EXPECT_THAT(getSymbols("::Red"), ElementsAre(Named("Red")));
- EXPECT_THAT(getSymbols("Green"), ElementsAre(Named("Green")));
- EXPECT_THAT(getSymbols("Green"), ElementsAre(Named("Green")));
- EXPECT_THAT(getSymbols("Color2::Yellow"), ElementsAre(Named("Yellow")));
- EXPECT_THAT(getSymbols("Yellow"), ElementsAre(Named("Yellow")));
+ EXPECT_THAT(getSymbols("Red"), ElementsAre(QName("Red")));
+ EXPECT_THAT(getSymbols("::Red"), ElementsAre(QName("Red")));
+ EXPECT_THAT(getSymbols("Green"), ElementsAre(QName("Green")));
+ EXPECT_THAT(getSymbols("Green"), ElementsAre(QName("Green")));
+ EXPECT_THAT(getSymbols("Color2::Yellow"),
+ ElementsAre(QName("Color2::Yellow")));
+ EXPECT_THAT(getSymbols("Yellow"), ElementsAre(QName("Color2::Yellow")));
- EXPECT_THAT(getSymbols("ns::Black"), ElementsAre(Named("Black")));
- EXPECT_THAT(getSymbols("ns::Blue"), ElementsAre(Named("Blue")));
- EXPECT_THAT(getSymbols("ns::Color4::White"), ElementsAre(Named("White")));
+ EXPECT_THAT(getSymbols("ns::Black"), ElementsAre(QName("ns::Black")));
+ EXPECT_THAT(getSymbols("ns::Blue"), ElementsAre(QName("ns::Blue")));
+ EXPECT_THAT(getSymbols("ns::Color4::White"),
+ ElementsAre(QName("ns::Color4::White")));
}
TEST_F(WorkspaceSymbolsTest, WithLimit) {
@@ -273,15 +262,13 @@
#include "foo.h"
)cpp");
EXPECT_THAT(getSymbols("foo"),
- UnorderedElementsAre(AllOf(Named("foo"), InContainer(""),
- WithKind(SymbolKind::Variable)),
- AllOf(Named("foo2"), InContainer(""),
- WithKind(SymbolKind::Variable))));
+ UnorderedElementsAre(
+ AllOf(QName("foo"), WithKind(SymbolKind::Variable)),
+ AllOf(QName("foo2"), WithKind(SymbolKind::Variable))));
Limit = 1;
EXPECT_THAT(getSymbols("foo"),
- ElementsAre(AnyOf((Named("foo"), InContainer("")),
- AllOf(Named("foo2"), InContainer("")))));
+ ElementsAre(AnyOf(QName("foo"), QName("foo2"))));
}
} // namespace clangd
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
