araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Common/Util: Trinity::StringTo<double> support (PR #25364)

Browse Source 
(cherry picked from commit f45aa5cac1)
This commit is contained in:
Treeston
2020-09-02 22:04:45 +02:00
committed by Shauren
parent 0d54a5ecb4
commit da8a66a05e
4 changed files with 136 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/common/StringConvert.cpp
View File

@@ -119,7 +119,7 @@ TEST_CASE("String to smaller integer types", "[StringConvert]")
REQUIRE(Trinity::StringTo<int16>("-1", 0) == -1);
}
TEST_CASE("Test.String to boolean", "[StringConvert]")
TEST_CASE("String to boolean", "[StringConvert]")
{
REQUIRE(Trinity::StringTo<bool>("true") == true);
REQUIRE(Trinity::StringTo<bool>("false") == false);
@@ -129,3 +129,26 @@ TEST_CASE("Test.String to boolean", "[StringConvert]")
REQUIRE(Trinity::StringTo<bool>("1", 10) == true);
REQUIRE(Trinity::StringTo<bool>("0", 10) == false);
}
TEST_CASE("String to double", "[StringConvert]")
{
using namespace Catch::literals;
REQUIRE(Trinity::StringTo<double>("0.5") == 0.5);
REQUIRE(Trinity::StringTo<double>("0.1") == 0.1_a);
REQUIRE(Trinity::StringTo<double>("1.2.3") == std::nullopt);
REQUIRE(Trinity::StringTo<double>("1e+5") == 100000.0);
REQUIRE(Trinity::StringTo<double>("1e+3+5") == std::nullopt);
REQUIRE(Trinity::StringTo<double>("a1.5") == std::nullopt);
REQUIRE(Trinity::StringTo<double>("1.5tail") == std::nullopt);
REQUIRE(Trinity::StringTo<double>("0x0") == 0.0);
REQUIRE(Trinity::StringTo<double>("0x0", 16) == std::nullopt);
REQUIRE(Trinity::StringTo<double>("0", 16) == 0.0);
REQUIRE(Trinity::StringTo<double>("0x1.BC70A3D70A3D7p+6") == 0x1.BC70A3D70A3D7p+6);
REQUIRE(Trinity::StringTo<double>("0x1.BC70A3D70A3D7p+6", 10) == std::nullopt);
REQUIRE(Trinity::StringTo<double>("0x1.BC70A3D70A3D7p+6", 16) == std::nullopt);
REQUIRE(Trinity::StringTo<double>("1.BC70A3D70A3D7p+6", 16) == 0x1.BC70A3D70A3D7p+6);
REQUIRE(Trinity::StringTo<double>("0x1.2.3") == std::nullopt);
REQUIRE(Trinity::StringTo<double>("0x1.AAAp+1-3") == std::nullopt);
REQUIRE(Trinity::StringTo<double>("1.2.3", 16) == std::nullopt);
REQUIRE(Trinity::StringTo<double>("1.AAAp+1-3", 16) == std::nullopt);
}

27
tests/game/ChatCommand.cpp
View File

@@ -48,13 +48,30 @@ TEST_CASE("Command argument parsing", "[ChatCommand]")
TestChatCommand("true", [](ChatHandler*, uint32) { return true; }, false);
}
SECTION("std::vector<uint8>")
SECTION("Floating point argument")
{
TestChatCommand("1 2 3 4 5 6 7 8 9 10", [](ChatHandler*, std::vector<uint8> v)
TestChatCommand("0.5", [](ChatHandler*, float f)
{
REQUIRE(v.size() == 10);
for (size_t i = 0; i < 10; ++i)
REQUIRE(v[i] == (i + 1));
REQUIRE(f == 0.5);
return true;
});
TestChatCommand("true", [](ChatHandler*, float) { return true; }, false);
}
SECTION("std::vector<uint16>")
{
TestChatCommand("1 2 3 4 5 6 7 8 9 10", [](ChatHandler*, std::vector<uint16> v)
{
REQUIRE(v == std::vector<uint16>{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
return true;
});
}
SECTION("std::array<uint16>")
{
TestChatCommand("1 2 3 4 5 6 7 8 9 10", [](ChatHandler*, std::array<uint16, 10> v)
{
REQUIRE(v == std::array<uint16, 10>{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
return true;
});
}