This is an archive of the discontinued LLVM Phabricator instance.

Differential D126608

[clangd] Remove a test with a duplicate of FileCacheTests
ClosedPublic

Authored by JohnTitor on May 28 2022, 6:11 PM.

Details

Reviewers
sammccall
Commits
rG5c1494039491: [clangd] Remove a test with a duplicate of FileCacheTests
Summary

FIXME says it should be removed so followed it.

Diff Detail

Event Timeline

JohnTitor created this revision.May 28 2022, 6:11 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 28 2022, 6:11 PM
Herald added subscribers: usaxena95, kadircet, arphaman. · View Herald Transcript
JohnTitor requested review of this revision.May 28 2022, 6:11 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 28 2022, 6:11 PM
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov. · View Herald Transcript
JohnTitor added a reviewer: sammccall.May 28 2022, 6:12 PM
Harbormaster completed remote builds in B166802: Diff 432764.May 28 2022, 6:27 PM
sammccall accepted this revision.May 31 2022, 6:03 AM

Thanks!

This revision is now accepted and ready to land.May 31 2022, 6:03 AM
Closed by commit rG5c1494039491: [clangd] Remove a test with a duplicate of FileCacheTests (authored by JohnTitor). · Explain WhyMay 31 2022, 4:16 PM
This revision was automatically updated to reflect the committed changes.
JohnTitor added a commit: rG5c1494039491: [clangd] Remove a test with a duplicate of FileCacheTests.

Revision Contents

PathSize
clang-tools-extra/
clangd/
unittests/
38 lines

Diff 433220

clang-tools-extra/clangd/unittests/ConfigProviderTests.cpp

Show First 20 Lines • Show All 172 Lines • ▼ Show 20 LinesTEST(ProviderTest, FromAncestorRelativeYAMLFiles) {
FS.Files.erase("a/foo.yaml"); FS.Files.erase("a/foo.yaml");
Cfg = P->getConfig(ABCParams, Diags.callback()); Cfg = P->getConfig(ABCParams, Diags.callback());
EXPECT_THAT(Diags.Diagnostics, IsEmpty()); EXPECT_THAT(Diags.Diagnostics, IsEmpty());
EXPECT_THAT(Diags.Files, IsEmpty()); EXPECT_THAT(Diags.Files, IsEmpty());
EXPECT_THAT(getAddedArgs(Cfg), ElementsAre("bar", "baz")); EXPECT_THAT(getAddedArgs(Cfg), ElementsAre("bar", "baz"));
} }
// FIXME: delete this test, it's covered by FileCacheTests.
TEST(ProviderTest, Staleness) {
MockFS FS;
auto StartTime = std::chrono::steady_clock::now();
Params StaleOK;
StaleOK.FreshTime = StartTime;
Params MustBeFresh;
MustBeFresh.FreshTime = StartTime + std::chrono::hours(1);
CapturedDiags Diags;
auto P = Provider::fromYAMLFile(testPath("foo.yaml"), /*Directory=*/"", FS);
// Initial query always reads, regardless of policy.
FS.Files["foo.yaml"] = AddFooWithErr;
auto Cfg = P->getConfig(StaleOK, Diags.callback());
EXPECT_THAT(Diags.Diagnostics,
ElementsAre(diagMessage("Unknown CompileFlags key 'Unknown'")));
EXPECT_THAT(getAddedArgs(Cfg), ElementsAre("foo"));
Diags.clear();
// Stale value reused by policy.
FS.Files["foo.yaml"] = AddBarBaz;
Cfg = P->getConfig(StaleOK, Diags.callback());
EXPECT_THAT(Diags.Diagnostics, IsEmpty()) << "Cached, not re-parsed";
EXPECT_THAT(getAddedArgs(Cfg), ElementsAre("foo"));
// Cache revalidated by policy.
Cfg = P->getConfig(MustBeFresh, Diags.callback());
EXPECT_THAT(Diags.Diagnostics, IsEmpty()) << "New config, no errors";
EXPECT_THAT(getAddedArgs(Cfg), ElementsAre("bar", "baz"));
// Cache revalidated by (default) policy.
FS.Files.erase("foo.yaml");
Cfg = P->getConfig(Params(), Diags.callback());
EXPECT_THAT(Diags.Diagnostics, IsEmpty());
EXPECT_THAT(getAddedArgs(Cfg), IsEmpty());
}
TEST(ProviderTest, SourceInfo) { TEST(ProviderTest, SourceInfo) {
MockFS FS; MockFS FS;
FS.Files["baz/foo.yaml"] = R"yaml( FS.Files["baz/foo.yaml"] = R"yaml(
If: If:
PathMatch: .* PathMatch: .*
PathExclude: bar.h PathExclude: bar.h
CompileFlags: CompileFlags:
Show All 27 Lines