mirror of
https://codeberg.org/comaps/comaps
synced 2026-01-08 05:17:56 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -37,10 +37,8 @@ void CheckExpectations(StringUtf8Multilang const & s, vector<ExpectedName> const
|
||||
size_t counter = 0;
|
||||
s.ForEach([&expectations, &counter](int8_t const code, string_view name)
|
||||
{
|
||||
auto const it = find_if(expectations.begin(), expectations.end(), [&code](ExpectedName const & item)
|
||||
{
|
||||
return GetLangCode(item.m_lang.c_str()) == code;
|
||||
});
|
||||
auto const it = find_if(expectations.begin(), expectations.end(),
|
||||
[&code](ExpectedName const & item) { return GetLangCode(item.m_lang.c_str()) == code; });
|
||||
|
||||
if (it == expectations.end())
|
||||
TEST(false, ("Unexpected language code: ", code, ". Expectations: ", expectations));
|
||||
@@ -49,17 +47,18 @@ void CheckExpectations(StringUtf8Multilang const & s, vector<ExpectedName> const
|
||||
++counter;
|
||||
});
|
||||
|
||||
TEST_EQUAL(counter, expectations.size(), ("Unexpected count of names, expected ", expectations.size(),
|
||||
", but turned out ", counter, ". Expectations: ", expectations));
|
||||
TEST_EQUAL(counter, expectations.size(),
|
||||
("Unexpected count of names, expected ", expectations.size(), ", but turned out ", counter,
|
||||
". Expectations: ", expectations));
|
||||
}
|
||||
|
||||
UNIT_TEST(EditableMapObject_SetWebsite)
|
||||
{
|
||||
pair<char const *, char const *> arr[] = {
|
||||
{ "https://some.thing.org", "https://some.thing.org" },
|
||||
{ "http://some.thing.org", "http://some.thing.org" },
|
||||
{ "some.thing.org", "http://some.thing.org" },
|
||||
{ "", "" },
|
||||
{"https://some.thing.org", "https://some.thing.org"},
|
||||
{"http://some.thing.org", "http://some.thing.org"},
|
||||
{"some.thing.org", "http://some.thing.org"},
|
||||
{"", ""},
|
||||
};
|
||||
|
||||
EditableMapObject emo;
|
||||
@@ -78,13 +77,13 @@ UNIT_TEST(EditableMapObject_ValidateBuildingLevels)
|
||||
TEST(EditableMapObject::ValidateBuildingLevels("25"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("0"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("005"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels(std::to_string(EditableMapObject::kMaximumLevelsEditableByUsers + 1)), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels(std::to_string(EditableMapObject::kMaximumLevelsEditableByUsers + 1)),
|
||||
());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("22a"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("a22"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("2a22"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("ab"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels(
|
||||
"2345534564564453645534545345534564564453645"), ());
|
||||
TEST(!EditableMapObject::ValidateBuildingLevels("2345534564564453645534545345534564564453645"), ());
|
||||
}
|
||||
|
||||
UNIT_TEST(EditableMapObject_ValidateHouseNumber)
|
||||
@@ -199,28 +198,44 @@ UNIT_TEST(EditableMapObject_ValidateEmail)
|
||||
|
||||
UNIT_TEST(EditableMapObject_ValidateName)
|
||||
{
|
||||
vector<string> correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c", "a,b.c",
|
||||
"a$bc", "a%bc", "a#bc", "a№bc", "c&a", "a[bc"};
|
||||
vector<string> incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a<bc", "a{bc", "*",
|
||||
"a*bc", "a=bc", "a_bc", "a±bc", "a\nbc", "a\tbc", "a\rbc",
|
||||
"a\vbc", "a\fbc", "a|bc", "N√", "Hello World!\U0001F600",
|
||||
"Exit →", "∫0dx = C", "\U0001210A", "⚠︎", "⚠️"};
|
||||
vector<string> correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c",
|
||||
"a,b.c", "a$bc", "a%bc", "a#bc", "a№bc", "c&a", "a[bc"};
|
||||
vector<string> incorrectNames = {"a^bc",
|
||||
"a~bc",
|
||||
"a§bc",
|
||||
"a>bc",
|
||||
"a<bc",
|
||||
"a{bc",
|
||||
"*",
|
||||
"a*bc",
|
||||
"a=bc",
|
||||
"a_bc",
|
||||
"a±bc",
|
||||
"a\nbc",
|
||||
"a\tbc",
|
||||
"a\rbc",
|
||||
"a\vbc",
|
||||
"a\fbc",
|
||||
"a|bc",
|
||||
"N√",
|
||||
"Hello World!\U0001F600",
|
||||
"Exit →",
|
||||
"∫0dx = C",
|
||||
"\U0001210A",
|
||||
"⚠︎",
|
||||
"⚠️"};
|
||||
|
||||
for (auto const & name : correctNames)
|
||||
{
|
||||
TEST(EditableMapObject::ValidateName(name), ());
|
||||
}
|
||||
|
||||
for (auto const & name : incorrectNames)
|
||||
{
|
||||
TEST(!EditableMapObject::ValidateName(name), ());
|
||||
}
|
||||
}
|
||||
|
||||
UNIT_TEST(EditableMapObject_CanUseAsDefaultName)
|
||||
{
|
||||
EditableMapObject emo;
|
||||
vector<int8_t> const nativeMwmLanguages {GetLangCode("de"), GetLangCode("fr")};
|
||||
vector<int8_t> const nativeMwmLanguages{GetLangCode("de"), GetLangCode("fr")};
|
||||
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("de"), nativeMwmLanguages),
|
||||
("Check possibility to use Mwm language code"));
|
||||
@@ -228,8 +243,7 @@ UNIT_TEST(EditableMapObject_CanUseAsDefaultName)
|
||||
("Check possibility to use Mwm language code"));
|
||||
TEST(!EditableMapObject::CanUseAsDefaultName(GetLangCode("int_name"), nativeMwmLanguages),
|
||||
("Check possibility to use international language code"));
|
||||
TEST(!EditableMapObject::CanUseAsDefaultName(100, nativeMwmLanguages),
|
||||
("Incorrect language code is not supported"));
|
||||
TEST(!EditableMapObject::CanUseAsDefaultName(100, nativeMwmLanguages), ("Incorrect language code is not supported"));
|
||||
TEST(!EditableMapObject::CanUseAsDefaultName(GetLangCode("en"), {GetLangCode("abcd")}),
|
||||
("Incorrect Mwm language name is not supported"));
|
||||
TEST(!EditableMapObject::CanUseAsDefaultName(GetLangCode("en"), nativeMwmLanguages),
|
||||
@@ -242,16 +256,13 @@ UNIT_TEST(EditableMapObject_CanUseAsDefaultName)
|
||||
names.AddString(GetLangCode("fr"), "second mwm language");
|
||||
emo.SetName(names);
|
||||
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages),
|
||||
("It is possible to fix typo"));
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages), ("It is possible to fix typo"));
|
||||
|
||||
names.AddString(GetLangCode("de"), "first mwm language");
|
||||
emo.SetName(names);
|
||||
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("de"), nativeMwmLanguages),
|
||||
("It is possible to fix typo"));
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages),
|
||||
("It is possible to fix typo"));
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("de"), nativeMwmLanguages), ("It is possible to fix typo"));
|
||||
TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages), ("It is possible to fix typo"));
|
||||
}
|
||||
|
||||
UNIT_TEST(EditableMapObject_GetNamesDataSource)
|
||||
@@ -272,38 +283,36 @@ UNIT_TEST(EditableMapObject_GetNamesDataSource)
|
||||
|
||||
vector<int8_t> nativeMwmLanguages = {GetLangCode("de"), GetLangCode("fr")};
|
||||
|
||||
auto const namesDataSource = EditableMapObject::GetNamesDataSource(
|
||||
emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("ko"));
|
||||
auto const namesDataSource =
|
||||
EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("ko"));
|
||||
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
|
||||
TEST_EQUAL(namesDataSource.names[0].m_code, GetLangCode("default"),("Default is always first in the list"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
|
||||
TEST_EQUAL(namesDataSource.names[0].m_code, GetLangCode("default"), ("Default is always first in the list"));
|
||||
|
||||
{
|
||||
vector<int8_t> nativeMwmLanguages = {GetLangCode("de"), GetLangCode("fr")};
|
||||
|
||||
auto const namesDataSource = EditableMapObject::GetNamesDataSource(
|
||||
emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
|
||||
auto const namesDataSource =
|
||||
EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
|
||||
}
|
||||
{
|
||||
vector<int8_t> nativeMwmLanguages = {GetLangCode("fr"), GetLangCode("en")};
|
||||
|
||||
auto const namesDataSource = EditableMapObject::GetNamesDataSource(
|
||||
emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
|
||||
auto const namesDataSource =
|
||||
EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
|
||||
}
|
||||
{
|
||||
vector<int8_t> nativeMwmLanguages = {GetLangCode("en"), GetLangCode("en")};
|
||||
|
||||
auto const namesDataSource = EditableMapObject::GetNamesDataSource(
|
||||
emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("en"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9,
|
||||
("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,
|
||||
("Mandatory names count should always be 1"));
|
||||
auto const namesDataSource =
|
||||
EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("en"));
|
||||
TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
|
||||
TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -317,7 +326,7 @@ void SetTypes(EditableMapObject & emo, std::initializer_list<base::StringIL> typ
|
||||
holder.Add(cl.GetTypeByPath(t));
|
||||
emo.SetTypes(holder);
|
||||
}
|
||||
} // namespace
|
||||
} // namespace
|
||||
|
||||
UNIT_TEST(EditableMapObject_SetInternet)
|
||||
{
|
||||
@@ -542,4 +551,4 @@ UNIT_TEST(EditableMapObject_GetLocalizedAllTypes)
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace editable_map_object_test
|
||||
} // namespace editable_map_object_test
|
||||
|
||||
Reference in New Issue
Block a user