Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Fixed environment variable confg test compilation on windows

Browse Source
This commit is contained in:
Shauren
2023-01-06 16:55:58 +01:00
parent 1afec8be63
commit cd62dc4491
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/common/Config.cpp
View File

@@ -21,6 +21,8 @@
#include "Config.h"
#include <boost/filesystem.hpp>
#include <cstdlib>
#include <cstring>
#include <map>
#include <string>
std::string CreateConfigWithMap(std::map<std::string, std::string> const& map)
@@ -36,10 +38,10 @@ std::string CreateConfigWithMap(std::map<std::string, std::string> const& map)
iniStream.close();
return mTempFileAbs.native();
return mTempFileAbs.string();
}
TEST_CASE("Envariable variables", "[Config]")
TEST_CASE("Environment variables", "[Config]")
{
std::map<std::string, std::string> config;
config["Int.Nested"] = "4242";
@@ -57,7 +59,7 @@ TEST_CASE("Envariable variables", "[Config]")
{
REQUIRE(sConfigMgr->GetIntDefault("Int.Nested", 10) == 4242);
setenv("TC_INT_NESTED", "8080", 1);
putenv(strdup("TC_INT_NESTED=8080"));
REQUIRE(!sConfigMgr->OverrideWithEnvVariablesIfAny().empty());
REQUIRE(sConfigMgr->GetIntDefault("Int.Nested", 10) == 8080);
}
@@ -66,7 +68,7 @@ TEST_CASE("Envariable variables", "[Config]")
{
REQUIRE(sConfigMgr->GetStringDefault("lower", "") == "simpleString");
setenv("TC_LOWER", "envstring", 1);
putenv(strdup("TC_LOWER=envstring"));
REQUIRE(!sConfigMgr->OverrideWithEnvVariablesIfAny().empty());
REQUIRE(sConfigMgr->GetStringDefault("lower", "") == "envstring");
}
@@ -75,29 +77,29 @@ TEST_CASE("Envariable variables", "[Config]")
{
REQUIRE(sConfigMgr->GetStringDefault("UPPER", "") == "simpleString");
setenv("TC_UPPER", "envupperstring", 1);
putenv(strdup("TC_UPPER=envupperstring"));
REQUIRE(!sConfigMgr->OverrideWithEnvVariablesIfAny().empty());
REQUIRE(sConfigMgr->GetStringDefault("UPPER", "") == "envupperstring");
}
SECTION("Long nested name with number")
{
REQUIRE(sConfigMgr->GetFloatDefault("SomeLong.NestedNameWithNumber.Like1", 0) == 1);
REQUIRE(sConfigMgr->GetFloatDefault("SomeLong.NestedNameWithNumber.Like1", 0) == 1.0f);
setenv("TC_SOME_LONG_NESTED_NAME_WITH_NUMBER_LIKE_1", "42", 1);
putenv(strdup("TC_SOME_LONG_NESTED_NAME_WITH_NUMBER_LIKE_1=42"));
REQUIRE(!sConfigMgr->OverrideWithEnvVariablesIfAny().empty());
REQUIRE(sConfigMgr->GetFloatDefault("SomeLong.NestedNameWithNumber.Like1", 0) == 42);
REQUIRE(sConfigMgr->GetFloatDefault("SomeLong.NestedNameWithNumber.Like1", 0) == 42.0f);
}
SECTION("String that not exist in config")
{
setenv("TC_UNIQUE_STRING", "somevalue", 1);
putenv(strdup("TC_UNIQUE_STRING=somevalue"));
REQUIRE(sConfigMgr->GetStringDefault("Unique.String", "") == "somevalue");
}
SECTION("Int that not exist in config")
{
setenv("TC_UNIQUE_INT", "100", 1);
putenv(strdup("TC_UNIQUE_INT=100"));
REQUIRE(sConfigMgr->GetIntDefault("Unique.Int", 1) == 100);
}

14
tests/common/StringConvert.cpp
View File

@@ -21,24 +21,24 @@
TEST_CASE("String to uint32", "[StringConvert]")
{
REQUIRE(Trinity::StringTo<uint32>("42") == 42);
REQUIRE(Trinity::StringTo<uint32>("42", 10) == 42);
REQUIRE(Trinity::StringTo<uint32>("42") == 42u);
REQUIRE(Trinity::StringTo<uint32>("42", 10) == 42u);
REQUIRE(Trinity::StringTo<uint32>(" 42") == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("tail42") == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("42tail") == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("ff", 16) == 0xff);
REQUIRE(Trinity::StringTo<uint32>("ff", 16) == 0xFFu);
REQUIRE(Trinity::StringTo<uint32>("0xff") == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("0xff", 0) == 0xff);
REQUIRE(Trinity::StringTo<uint32>("0xff", 0) == 0xFFu);
REQUIRE(Trinity::StringTo<uint32>("101010", 2) == 0b101010);
REQUIRE(Trinity::StringTo<uint32>("101010", 2) == 0b101010u);
REQUIRE(Trinity::StringTo<uint32>("0b101010") == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("0b101010", 0) == 0b101010);
REQUIRE(Trinity::StringTo<uint32>("0b101010", 0) == 0b101010u);
REQUIRE(Trinity::StringTo<uint32>("5000000000") == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("100000000", 16) == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("0x100000000", 0) == std::nullopt);
REQUIRE(Trinity::StringTo<uint32>("0xffffffff", 0) == 0xffffffff);
REQUIRE(Trinity::StringTo<uint32>("0xffffffff", 0) == 0xFFFFFFFF);
}
TEST_CASE("String to uint64", "[StringConvert]")