tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make StringIndexer not a singleton

Browse Source
This commit is contained in:
Bart Louwers
2023-10-04 12:47:17 +00:00
parent 43bafd2819
commit 0a81468939
33 changed files with 186 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/util/string_indexer.test.cpp
View File

@@ -7,46 +7,46 @@
using namespace mbgl;
TEST(StringIndexer, AddStrings) {
StringIndexer::clear();
EXPECT_EQ(StringIndexer::size(), 0);
StringIndexer strIndexer;
EXPECT_EQ(strIndexer.size(), 0);
const auto id1 = StringIndexer::get("test string1");
const auto id1 = strIndexer.get("test string1");
EXPECT_EQ(id1, 0);
EXPECT_EQ(StringIndexer::size(), 1);
EXPECT_EQ(strIndexer.size(), 1);
const std::string_view s2 = "test string2";
const auto id2 = StringIndexer::get(s2);
const auto id2 = strIndexer.get(s2);
EXPECT_EQ(id2, 1);
EXPECT_EQ(StringIndexer::size(), 2);
EXPECT_EQ(strIndexer.size(), 2);
}
TEST(StringIndexer, GetString) {
StringIndexer::clear();
EXPECT_EQ(StringIndexer::size(), 0);
StringIndexer strIndexer;
EXPECT_EQ(strIndexer.size(), 0);
constexpr auto str = "test string1";
const auto id1 = StringIndexer::get(str);
const auto id1 = strIndexer.get(str);
EXPECT_EQ(id1, 0);
EXPECT_EQ(StringIndexer::size(), 1);
EXPECT_EQ(strIndexer.size(), 1);
const auto str1 = StringIndexer::get(id1);
const auto str1 = strIndexer.get(id1);
EXPECT_EQ(str, str1);
const auto str2 = str;
const auto id2 = StringIndexer::get(str2);
const auto id2 = strIndexer.get(str2);
EXPECT_EQ(id1, id2);
}
TEST(StringIndexer, Reallocate) {
StringIndexer::clear();
EXPECT_EQ(StringIndexer::size(), 0);
StringIndexer strIndexer;
EXPECT_EQ(strIndexer.size(), 0);
constexpr auto str = "reallocate test string1";
const auto id1 = StringIndexer::get(str);
const auto id1 = strIndexer.get(str);
EXPECT_EQ(id1, 0);
EXPECT_EQ(StringIndexer::size(), 1);
EXPECT_EQ(strIndexer.size(), 1);
// force reallocation. assume capacity: 100 strings, 100 * 32 bytes buffer space
constexpr auto N = 1000;
@@ -55,31 +55,31 @@ TEST(StringIndexer, Reallocate) {
return "1234567890"s + "1234567890"s + "1234567890"s + "---" + std::to_string(i);
};
for (auto i = 1; i < N; ++i) {
StringIndexer::get(string_for_i(i));
strIndexer.get(string_for_i(i));
}
EXPECT_EQ(StringIndexer::size(), N);
EXPECT_EQ(strIndexer.size(), N);
const auto str1 = StringIndexer::get(id1);
const auto str1 = strIndexer.get(id1);
EXPECT_EQ(str, str1);
for (auto i = 1; i < N; ++i) {
const auto strN1 = StringIndexer::get(i);
const auto strN1 = strIndexer.get(i);
EXPECT_EQ(strN1, string_for_i(i));
}
}
TEST(StringIndexer, GetOOBIdentity) {
StringIndexer::clear();
EXPECT_EQ(StringIndexer::size(), 0);
StringIndexer strIndexer;
EXPECT_EQ(strIndexer.size(), 0);
std::string str;
#ifndef NDEBUG
EXPECT_DEATH_IF_SUPPORTED(str = StringIndexer::get(42), "id < identityToString.size()");
EXPECT_DEATH_IF_SUPPORTED(str = strIndexer.get(42), "id < identityToString.size()");
#endif
EXPECT_TRUE(str.empty());
#ifndef NDEBUG
EXPECT_DEATH_IF_SUPPORTED(str = StringIndexer::get(-1), "id < identityToString.size()");
EXPECT_DEATH_IF_SUPPORTED(str = strIndexer.get(-1), "id < identityToString.size()");
#endif
EXPECT_TRUE(str.empty());
}