mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-31 18:55:23 +01:00
Code Issues Releases Wiki Activity

Rename String methods to use lowerCamelCase

Browse Source
This commit is contained in:
Aaron van Geffen
2024-12-11 22:28:31 +01:00
parent a24dc2e60a
commit 35e117aca2
102 changed files with 587 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
test/tests/StringTest.cpp
View File

@@ -44,7 +44,7 @@ TEST_P(StringTest, Trim)
auto testCase = GetParam();
std::string input = std::get<0>(testCase);
std::string expected = std::get<1>(testCase);
std::string actual = String::Trim(input);
std::string actual = String::trim(input);
ASSERT_EQ(expected, actual);
}
@@ -53,32 +53,32 @@ TEST_P(StringTest, TrimStart)
auto testCase = GetParam();
std::string input = std::get<0>(testCase);
std::string expected = std::get<2>(testCase);
std::string actual = String::TrimStart(input);
std::string actual = String::trimStart(input);
ASSERT_EQ(expected, actual);
}
///////////////////////////////////////////////////////////////////////////////
// Tests for String::Split
// Tests for String::split
///////////////////////////////////////////////////////////////////////////////
TEST_F(StringTest, Split_ByComma)
{
auto actual = String::Split("a,bb,ccc,dd", ",");
auto actual = String::split("a,bb,ccc,dd", ",");
AssertVector<std::string>(actual, { "a", "bb", "ccc", "dd" });
}
TEST_F(StringTest, Split_ByColonColon)
{
auto actual = String::Split("a::bb:ccc:::::dd", "::");
auto actual = String::split("a::bb:ccc:::::dd", "::");
AssertVector<std::string>(actual, { "a", "bb:ccc", "", ":dd" });
}
TEST_F(StringTest, Split_Empty)
{
auto actual = String::Split("", ".");
auto actual = String::split("", ".");
AssertVector<std::string>(actual, {});
}
TEST_F(StringTest, Split_ByEmpty)
{
EXPECT_THROW(String::Split("string", ""), std::invalid_argument);
EXPECT_THROW(String::split("string", ""), std::invalid_argument);
}
///////////////////////////////////////////////////////////////////////////////
@@ -89,7 +89,7 @@ TEST_F(StringTest, Convert_950_to_UTF8)
{
auto input = StringFromHex("a7d6b374aabab4c4a6e2aab0af57");
auto expected = u8"快速的棕色狐狸";
auto actual = String::ConvertToUtf8(input, OpenRCT2::CodePage::CP_950);
auto actual = String::convertToUtf8(input, OpenRCT2::CodePage::CP_950);
ASSERT_EQ(expected, actual);
}
@@ -97,7 +97,7 @@ TEST_F(StringTest, Convert_UTF8_to_UTF8)
{
auto input = u8"سريع|brown|ثعلب";
auto expected = input;
auto actual = String::ConvertToUtf8(input, OpenRCT2::CodePage::UTF8);
auto actual = String::convertToUtf8(input, OpenRCT2::CodePage::UTF8);
ASSERT_EQ(expected, actual);
}
@@ -105,49 +105,49 @@ TEST_F(StringTest, Convert_Empty)
{
auto input = "";
auto expected = input;
auto actual = String::ConvertToUtf8(input, OpenRCT2::CodePage::CP_1252);
auto actual = String::convertToUtf8(input, OpenRCT2::CodePage::CP_1252);
ASSERT_EQ(expected, actual);
}
///////////////////////////////////////////////////////////////////////////////
// Tests for String::ToUpper
// Tests for String::toUpper
///////////////////////////////////////////////////////////////////////////////
TEST_F(StringTest, ToUpper_Basic)
{
auto actual = String::ToUpper("test TEST tEsT 1234");
auto actual = String::toUpper("test TEST tEsT 1234");
ASSERT_STREQ(actual.c_str(), "TEST TEST TEST 1234");
}
TEST_F(StringTest, ToUpper_Dutch)
{
auto actual = String::ToUpper(u8"fijntjes puffend fietsen");
auto actual = String::toUpper(u8"fijntjes puffend fietsen");
ASSERT_STREQ(actual.c_str(), u8"FIJNTJES PUFFEND FIETSEN");
}
TEST_F(StringTest, ToUpper_French)
{
auto actual = String::ToUpper(u8"jusqu'à 2500 carrés de côté");
auto actual = String::toUpper(u8"jusqu'à 2500 carrés de côté");
ASSERT_STREQ(actual.c_str(), u8"JUSQU'À 2500 CARRÉS DE CÔTÉ");
}
TEST_F(StringTest, ToUpper_Greek)
{
auto actual = String::ToUpper(u8"μέχρι 2500 τετράγωνα στην άκρη");
auto actual = String::toUpper(u8"μέχρι 2500 τετράγωνα στην άκρη");
ASSERT_STREQ(actual.c_str(), u8"ΜΈΧΡΙ 2500 ΤΕΤΡΆΓΩΝΑ ΣΤΗΝ ΆΚΡΗ");
}
TEST_F(StringTest, ToUpper_Russian)
{
auto actual = String::ToUpper(u8"до 2500 квадратов в сторону");
auto actual = String::toUpper(u8"до 2500 квадратов в сторону");
ASSERT_STREQ(actual.c_str(), u8"ДО 2500 КВАДРАТОВ В СТОРОНУ");
}
TEST_F(StringTest, ToUpper_Japanese)
{
auto actual = String::ToUpper(u8"日本語で大文字がなし");
auto actual = String::toUpper(u8"日本語で大文字がなし");
ASSERT_STREQ(actual.c_str(), u8"日本語で大文字がなし");
}
TEST_F(StringTest, StrLogicalCmp)
{
auto res_logical_1 = String::StrLogicalCmp("foo1", "foo1_2");
auto res_logical_2 = String::StrLogicalCmp("foo1_2", "foo1");
auto res_logical_1 = String::logicalCmp("foo1", "foo1_2");
auto res_logical_2 = String::logicalCmp("foo1_2", "foo1");
auto res_1 = strcmp("foo1", "foo1_2");
auto res_2 = strcmp("foo1_2", "foo1");
// We only care if sign is correct, actual values might not be.
@@ -155,74 +155,74 @@ TEST_F(StringTest, StrLogicalCmp)
EXPECT_GE(res_2 * res_logical_2, 1);
EXPECT_NE(res_logical_1, res_logical_2);
EXPECT_GT(String::StrLogicalCmp("foo12", "foo1"), 0);
EXPECT_LT(String::StrLogicalCmp("foo12", "foo13"), 0);
EXPECT_EQ(String::StrLogicalCmp("foo13", "foo13"), 0);
EXPECT_GT(String::logicalCmp("foo12", "foo1"), 0);
EXPECT_LT(String::logicalCmp("foo12", "foo13"), 0);
EXPECT_EQ(String::logicalCmp("foo13", "foo13"), 0);
EXPECT_EQ(String::StrLogicalCmp("foo13", "FOO13"), 0);
EXPECT_EQ(String::logicalCmp("foo13", "FOO13"), 0);
EXPECT_LT(String::StrLogicalCmp("A", "b"), 0);
EXPECT_LT(String::StrLogicalCmp("a", "B"), 0);
EXPECT_GT(String::StrLogicalCmp("B", "a"), 0);
EXPECT_GT(String::StrLogicalCmp("b", "A"), 0);
EXPECT_LT(String::logicalCmp("A", "b"), 0);
EXPECT_LT(String::logicalCmp("a", "B"), 0);
EXPECT_GT(String::logicalCmp("B", "a"), 0);
EXPECT_GT(String::logicalCmp("b", "A"), 0);
// ^ is used at the start of a ride name to move it to the end of the list
EXPECT_LT(String::StrLogicalCmp("A", "^"), 0);
EXPECT_LT(String::StrLogicalCmp("a", "^"), 0);
EXPECT_LT(String::StrLogicalCmp("!", "A"), 0);
EXPECT_LT(String::StrLogicalCmp("!", "a"), 0);
EXPECT_LT(String::logicalCmp("A", "^"), 0);
EXPECT_LT(String::logicalCmp("a", "^"), 0);
EXPECT_LT(String::logicalCmp("!", "A"), 0);
EXPECT_LT(String::logicalCmp("!", "a"), 0);
}
TEST_F(StringTest, IEqualsU8String)
{
EXPECT_TRUE(String::IEquals(u8string{ u8"" }, u8string{ u8"" }));
EXPECT_TRUE(String::IEquals(u8string{ u8"Test" }, u8string{ u8"Test" }));
EXPECT_TRUE(String::IEquals(u8string{ u8"TesT" }, u8string{ u8"Test" }));
EXPECT_TRUE(String::IEquals(u8string{ u8"TEsT" }, u8string{ u8"Test" }));
EXPECT_TRUE(String::iequals(u8string{ u8"" }, u8string{ u8"" }));
EXPECT_TRUE(String::iequals(u8string{ u8"Test" }, u8string{ u8"Test" }));
EXPECT_TRUE(String::iequals(u8string{ u8"TesT" }, u8string{ u8"Test" }));
EXPECT_TRUE(String::iequals(u8string{ u8"TEsT" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::IEquals(u8string{ u8"Test" }, u8string{ u8"Message" }));
EXPECT_FALSE(String::IEquals(u8string{ u8"Test" }, u8string{ u8"TestMessage" }));
EXPECT_FALSE(String::IEquals(u8string{ u8"" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::IEquals(u8string{ u8"Test" }, u8string{ u8"" }));
EXPECT_FALSE(String::iequals(u8string{ u8"Test" }, u8string{ u8"Message" }));
EXPECT_FALSE(String::iequals(u8string{ u8"Test" }, u8string{ u8"TestMessage" }));
EXPECT_FALSE(String::iequals(u8string{ u8"" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::iequals(u8string{ u8"Test" }, u8string{ u8"" }));
}
TEST_F(StringTest, IEqualsU8StringView)
{
EXPECT_TRUE(String::IEquals(u8string_view{ u8"" }, u8string_view{ u8"" }));
EXPECT_TRUE(String::IEquals(u8string_view{ u8"Test" }, u8string_view{ u8"Test" }));
EXPECT_TRUE(String::IEquals(u8string_view{ u8"TesT" }, u8string_view{ u8"Test" }));
EXPECT_TRUE(String::IEquals(u8string_view{ u8"TEsT" }, u8string_view{ u8"Test" }));
EXPECT_TRUE(String::iequals(u8string_view{ u8"" }, u8string_view{ u8"" }));
EXPECT_TRUE(String::iequals(u8string_view{ u8"Test" }, u8string_view{ u8"Test" }));
EXPECT_TRUE(String::iequals(u8string_view{ u8"TesT" }, u8string_view{ u8"Test" }));
EXPECT_TRUE(String::iequals(u8string_view{ u8"TEsT" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::IEquals(u8string_view{ u8"Test" }, u8string_view{ u8"Message" }));
EXPECT_FALSE(String::IEquals(u8string_view{ u8"Test" }, u8string_view{ u8"TestMessage" }));
EXPECT_FALSE(String::IEquals(u8string_view{ u8"" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::IEquals(u8string_view{ u8"Test" }, u8string_view{ u8"" }));
EXPECT_FALSE(String::iequals(u8string_view{ u8"Test" }, u8string_view{ u8"Message" }));
EXPECT_FALSE(String::iequals(u8string_view{ u8"Test" }, u8string_view{ u8"TestMessage" }));
EXPECT_FALSE(String::iequals(u8string_view{ u8"" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::iequals(u8string_view{ u8"Test" }, u8string_view{ u8"" }));
}
TEST_F(StringTest, EqualsU8String)
{
EXPECT_TRUE(String::Equals(u8string{ u8"" }, u8string{ u8"" }));
EXPECT_TRUE(String::Equals(u8string{ u8"Test" }, u8string{ u8"Test" }));
EXPECT_TRUE(String::equals(u8string{ u8"" }, u8string{ u8"" }));
EXPECT_TRUE(String::equals(u8string{ u8"Test" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string{ u8"TesT" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string{ u8"TEsT" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string{ u8"Test" }, u8string{ u8"Message" }));
EXPECT_FALSE(String::Equals(u8string{ u8"Test" }, u8string{ u8"TestMessage" }));
EXPECT_FALSE(String::Equals(u8string{ u8"" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string{ u8"Test" }, u8string{ u8"" }));
EXPECT_FALSE(String::equals(u8string{ u8"TesT" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::equals(u8string{ u8"TEsT" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::equals(u8string{ u8"Test" }, u8string{ u8"Message" }));
EXPECT_FALSE(String::equals(u8string{ u8"Test" }, u8string{ u8"TestMessage" }));
EXPECT_FALSE(String::equals(u8string{ u8"" }, u8string{ u8"Test" }));
EXPECT_FALSE(String::equals(u8string{ u8"Test" }, u8string{ u8"" }));
}
TEST_F(StringTest, EqualsU8StringView)
{
EXPECT_TRUE(String::Equals(u8string_view{ u8"" }, u8string_view{ u8"" }));
EXPECT_TRUE(String::Equals(u8string_view{ u8"Test" }, u8string_view{ u8"Test" }));
EXPECT_TRUE(String::equals(u8string_view{ u8"" }, u8string_view{ u8"" }));
EXPECT_TRUE(String::equals(u8string_view{ u8"Test" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string_view{ u8"TesT" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string_view{ u8"TEsT" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string_view{ u8"Test" }, u8string_view{ u8"Message" }));
EXPECT_FALSE(String::Equals(u8string_view{ u8"Test" }, u8string_view{ u8"TestMessage" }));
EXPECT_FALSE(String::Equals(u8string_view{ u8"" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::Equals(u8string_view{ u8"Test" }, u8string_view{ u8"" }));
EXPECT_FALSE(String::equals(u8string_view{ u8"TesT" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::equals(u8string_view{ u8"TEsT" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::equals(u8string_view{ u8"Test" }, u8string_view{ u8"Message" }));
EXPECT_FALSE(String::equals(u8string_view{ u8"Test" }, u8string_view{ u8"TestMessage" }));
EXPECT_FALSE(String::equals(u8string_view{ u8"" }, u8string_view{ u8"Test" }));
EXPECT_FALSE(String::equals(u8string_view{ u8"Test" }, u8string_view{ u8"" }));
}
class CodepointViewTest : public testing::Test