mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-19 08:38:20 +00:00
Merge branch 'master' into akkadius/logsys-global-to-singleton
This commit is contained in:
+1
-2
@@ -34,13 +34,12 @@
|
||||
#include "task_state_test.h"
|
||||
|
||||
const EQEmuConfig *Config;
|
||||
PathManager path;
|
||||
|
||||
int main()
|
||||
{
|
||||
RegisterExecutablePlatform(ExePlatformClientImport);
|
||||
EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
|
||||
path.LoadPaths();
|
||||
PathManager::Instance()->Init();
|
||||
|
||||
auto ConfigLoadResult = EQEmuConfig::LoadConfig();
|
||||
Config = EQEmuConfig::get();
|
||||
|
||||
@@ -30,7 +30,6 @@ public:
|
||||
TEST_ADD(StringUtilTest::EscapeStringTest);
|
||||
TEST_ADD(StringUtilTest::SearchDeliminatedStringTest);
|
||||
TEST_ADD(StringUtilTest::SplitStringTest);
|
||||
TEST_ADD(StringUtilTest::FromCharsTest);
|
||||
TEST_ADD(StringUtilTest::TestIsFloat);
|
||||
TEST_ADD(StringUtilTest::TestIsNumber);
|
||||
}
|
||||
@@ -108,21 +107,6 @@ public:
|
||||
TEST_ASSERT(v[2] == "789");
|
||||
}
|
||||
|
||||
void FromCharsTest() {
|
||||
char int_chars[] = "123";
|
||||
int int_value = 0;
|
||||
|
||||
char float_chars[] = "3.14";
|
||||
float float_value = 0.0f;
|
||||
|
||||
Strings::from_chars(int_chars, int_value);
|
||||
TEST_ASSERT(int_value == 123);
|
||||
|
||||
Strings::from_chars(float_chars, float_value);
|
||||
TEST_ASSERT(float_value == 3.14f);
|
||||
|
||||
}
|
||||
|
||||
void TestIsFloat() {
|
||||
TEST_ASSERT_EQUALS(Strings::IsFloat("0.23424523"), true);
|
||||
TEST_ASSERT_EQUALS(Strings::IsFloat("12312312313.23424523"), true);
|
||||
|
||||
Reference in New Issue
Block a user