feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Improve file path cache

Browse Source 
Change-Id: I940dc63c0fc95fbb826ed7d19a1ac1e4db5a542c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2019-08-07 18:45:55 +02:00
parent d9b7092a87
commit 947cb9ed4e
8 changed files with 284 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/unit/unittest/stringcache-test.cpp
View File

@@ -55,7 +55,21 @@ using CacheEntries = Cache::CacheEntries;
class StringCache : public testing::Test
{
protected:
void SetUp();
void SetUp()
{
std::sort(filePaths.begin(), filePaths.end(), [](auto &f, auto &l) {
return compare(f, l) < 0;
});
std::sort(reverseFilePaths.begin(), reverseFilePaths.end(), [](auto &f, auto &l) {
return reverseCompare(f, l) < 0;
});
ON_CALL(mockStorage, fetchDirectoryId(Eq("foo"))).WillByDefault(Return(42));
ON_CALL(mockStorage, fetchDirectoryId(Eq("bar"))).WillByDefault(Return(43));
ON_CALL(mockStorage, fetchDirectoryId(Eq("poo"))).WillByDefault(Return(44));
ON_CALL(mockStorage, fetchDirectoryId(Eq("taa"))).WillByDefault(Return(45));
ON_CALL(mockStorage, fetchDirectoryPath(41)).WillByDefault(Return(Utils::PathString("bar")));
}
protected:
NiceMock<MockFilePathStorage> mockStorage;
@@ -490,15 +504,57 @@ TEST_F(StringCache, FetchDirectoryPathForUnknownIndex)
ASSERT_THAT(string, Eq("bar"));
}
void StringCache::SetUp()
TEST_F(StringCache, AddStringCalls)
{
std::sort(filePaths.begin(), filePaths.end(), [] (auto &f, auto &l) { return compare(f, l) < 0;});
std::sort(reverseFilePaths.begin(), reverseFilePaths.end(), [] (auto &f, auto &l) { return reverseCompare(f, l) < 0;});
EXPECT_CALL(mockStorage, fetchDirectoryId(Eq("foo")));
EXPECT_CALL(mockStorage, fetchDirectoryId(Eq("bar")));
EXPECT_CALL(mockStorage, fetchDirectoryId(Eq("poo")));
ON_CALL(mockStorage, fetchDirectoryId(Eq("foo")))
.WillByDefault(Return(42));
ON_CALL(mockStorage, fetchDirectoryPath(41))
.WillByDefault(Return(Utils::PathString("bar")));
}
cache.addStrings({"foo", "bar", "poo"}, mockStorageFetchDirectyId);
}
TEST_F(StringCache, AddStringCallsOnlyForNewStrings)
{
cache.addStrings({"foo", "poo"}, mockStorageFetchDirectyId);
EXPECT_CALL(mockStorage, fetchDirectoryId(Eq("taa")));
EXPECT_CALL(mockStorage, fetchDirectoryId(Eq("bar")));
cache.addStrings({"foo", "bar", "poo", "taa"}, mockStorageFetchDirectyId);
}
TEST_F(StringCache, GetStringIdAfterAddingStrings)
{
cache.addStrings({"foo", "bar", "poo", "taa"}, mockStorageFetchDirectyId);
ASSERT_THAT(cache.string(cache.stringId("taa")), Eq("taa"));
}
TEST_F(StringCache, GetStringAfterAddingStrings)
{
cache.addStrings({"foo", "bar", "poo", "taa"}, mockStorageFetchDirectyId);
ASSERT_THAT(cache.string(cache.stringId("taa")), Eq("taa"));
}
TEST_F(StringCache, GetStringIdAfterAddingStringsMultipleTimes)
{
cache.addStrings({"foo", "taa"}, mockStorageFetchDirectyId);
cache.addStrings({"foo", "bar", "poo", "taa"}, mockStorageFetchDirectyId);
ASSERT_THAT(cache.string(cache.stringId("taa")), Eq("taa"));
}
TEST_F(StringCache, GetStringIdAfterAddingTheSameStringsMultipleTimes)
{
cache.addStrings({"foo", "taa", "poo", "taa", "bar", "taa"}, mockStorageFetchDirectyId);
ASSERT_THAT(cache.string(cache.stringId("taa")), Eq("taa"));
}
TEST_F(StringCache, AddingEmptyStrings)
{
cache.addStrings({}, mockStorageFetchDirectyId);
}
} // namespace