From c33090469507432ba78074082d813be697769076 Mon Sep 17 00:00:00 2001 From: KimLS Date: Sun, 17 May 2020 19:10:12 -0700 Subject: [PATCH] Fix for broken tests --- tests/data_verification_test.h | 40 +++++++++++++------------- tests/fixed_memory_test.h | 46 +++++++++++++++--------------- tests/fixed_memory_variable_test.h | 16 +++++------ tests/ipc_mutex_test.h | 8 +++--- tests/memory_mapped_file_test.h | 4 +-- tests/skills_util_test.h | 8 +++--- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/tests/data_verification_test.h b/tests/data_verification_test.h index b9eb210fa..5053b922a 100644 --- a/tests/data_verification_test.h +++ b/tests/data_verification_test.h @@ -40,13 +40,13 @@ public: float value_f = 500.0f; int value_i = 500; - float vf1 = EQEmu::Clamp(value_f, 0.0f, 1000.0f); - float vf2 = EQEmu::Clamp(value_f, 0.0f, 250.0f); - float vf3 = EQEmu::Clamp(value_f, 750.0f, 1000.0f); + float vf1 = EQ::Clamp(value_f, 0.0f, 1000.0f); + float vf2 = EQ::Clamp(value_f, 0.0f, 250.0f); + float vf3 = EQ::Clamp(value_f, 750.0f, 1000.0f); - int vi1 = EQEmu::Clamp(value_i, 0, 1000); - int vi2 = EQEmu::Clamp(value_i, 0, 250); - int vi3 = EQEmu::Clamp(value_i, 750, 1000); + int vi1 = EQ::Clamp(value_i, 0, 1000); + int vi2 = EQ::Clamp(value_i, 0, 250); + int vi3 = EQ::Clamp(value_i, 750, 1000); TEST_ASSERT_EQUALS(vf1, 500.0f); TEST_ASSERT_EQUALS(vf2, 250.0f); @@ -61,11 +61,11 @@ public: float value_f = 500.0f; int value_i = 500; - float vf1 = EQEmu::ClampUpper(value_f, 1000.0f); - float vf2 = EQEmu::ClampUpper(value_f, 250.0f); + float vf1 = EQ::ClampUpper(value_f, 1000.0f); + float vf2 = EQ::ClampUpper(value_f, 250.0f); - int vi1 = EQEmu::ClampUpper(value_i, 1000); - int vi2 = EQEmu::ClampUpper(value_i, 250); + int vi1 = EQ::ClampUpper(value_i, 1000); + int vi2 = EQ::ClampUpper(value_i, 250); TEST_ASSERT_EQUALS(vf1, 500.0f); TEST_ASSERT_EQUALS(vf2, 250.0f); @@ -78,11 +78,11 @@ public: float value_f = 500.0f; int value_i = 500; - float vf1 = EQEmu::ClampLower(value_f, 0.0f); - float vf2 = EQEmu::ClampLower(value_f, 750.0f); + float vf1 = EQ::ClampLower(value_f, 0.0f); + float vf2 = EQ::ClampLower(value_f, 750.0f); - int vi1 = EQEmu::ClampLower(value_i, 0); - int vi2 = EQEmu::ClampLower(value_i, 750); + int vi1 = EQ::ClampLower(value_i, 0); + int vi2 = EQ::ClampLower(value_i, 750); TEST_ASSERT_EQUALS(vf1, 500.0f); TEST_ASSERT_EQUALS(vf2, 750.0f); @@ -95,13 +95,13 @@ public: float value_f = 500.0f; int value_i = 500; - TEST_ASSERT(EQEmu::ValueWithin(value_f, 0.0f, 1000.0f)); - TEST_ASSERT(!EQEmu::ValueWithin(value_f, 0.0f, 400.0f)); - TEST_ASSERT(!EQEmu::ValueWithin(value_f, 600.0f, 900.0f)); + TEST_ASSERT(EQ::ValueWithin(value_f, 0.0f, 1000.0f)); + TEST_ASSERT(!EQ::ValueWithin(value_f, 0.0f, 400.0f)); + TEST_ASSERT(!EQ::ValueWithin(value_f, 600.0f, 900.0f)); - TEST_ASSERT(EQEmu::ValueWithin(value_i, 0, 1000)); - TEST_ASSERT(!EQEmu::ValueWithin(value_i, 0, 400)); - TEST_ASSERT(!EQEmu::ValueWithin(value_i, 600, 900)); + TEST_ASSERT(EQ::ValueWithin(value_i, 0, 1000)); + TEST_ASSERT(!EQ::ValueWithin(value_i, 0, 400)); + TEST_ASSERT(!EQ::ValueWithin(value_i, 600, 900)); } }; diff --git a/tests/fixed_memory_test.h b/tests/fixed_memory_test.h index 055a85d79..faddc963f 100644 --- a/tests/fixed_memory_test.h +++ b/tests/fixed_memory_test.h @@ -27,7 +27,7 @@ class FixedMemoryHashTest : public Test::Suite { typedef void(FixedMemoryHashTest::*TestFunction)(void); public: FixedMemoryHashTest() { - size_ = EQEmu::FixedMemoryHashSet::estimated_size(72000, 190000); + size_ = EQ::FixedMemoryHashSet::estimated_size(72000, 190000); data_ = new uint8[size_]; memset(data_, 0, size_); TEST_ADD(FixedMemoryHashTest::InitTest); @@ -49,7 +49,7 @@ public: private: void InitTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_, 72000, 190000); + EQ::FixedMemoryHashSet hash(data_, size_, 72000, 190000); TEST_ASSERT(!hash.exists(1001)); TEST_ASSERT(hash.size() == 0); TEST_ASSERT(hash.max_size() == 72000); @@ -57,7 +57,7 @@ public: } void LoadTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); + EQ::FixedMemoryHashSet hash(data_, size_); TEST_ASSERT(!hash.exists(1001)); TEST_ASSERT(hash.size() == 0); TEST_ASSERT(hash.max_size() == 72000); @@ -65,8 +65,8 @@ public: } void InsertTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - EQEmu::ItemData item; + EQ::FixedMemoryHashSet hash(data_, size_); + EQ::ItemData item; memset(&item, 0, sizeof(item)); strcpy(item.Name, "Iron Sword"); item.ID = 1001; @@ -79,20 +79,20 @@ public: } void RetrieveTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); + EQ::FixedMemoryHashSet hash(data_, size_); TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.size() == 1); TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - EQEmu::ItemData item = hash[1001]; + EQ::ItemData item = hash[1001]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1001); } void OverwriteTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - EQEmu::ItemData item; + EQ::FixedMemoryHashSet hash(data_, size_); + EQ::ItemData item; memset(&item, 0, sizeof(item)); strcpy(item.Name, "Steel Sword"); item.ID = 1001; @@ -105,20 +105,20 @@ public: } void OverwriteRetrieveTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); + EQ::FixedMemoryHashSet hash(data_, size_); TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.size() == 1); TEST_ASSERT((hash.max_size() == 72000)); TEST_ASSERT(!hash.empty()); - EQEmu::ItemData item = hash[1001]; + EQ::ItemData item = hash[1001]; TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); TEST_ASSERT(item.ID == 1001); } void InsertAgainTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - EQEmu::ItemData item; + EQ::FixedMemoryHashSet hash(data_, size_); + EQ::ItemData item; memset(&item, 0, sizeof(item)); strcpy(item.Name, "Iron Sword"); item.ID = 1000; @@ -132,14 +132,14 @@ public: } void RetrieveAgainTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); + EQ::FixedMemoryHashSet hash(data_, size_); TEST_ASSERT(hash.exists(1000)); TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.size() == 2); TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - EQEmu::ItemData item = hash[1000]; + EQ::ItemData item = hash[1000]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1000); @@ -149,8 +149,8 @@ public: } void InsertBeginTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - EQEmu::ItemData item; + EQ::FixedMemoryHashSet hash(data_, size_); + EQ::ItemData item; memset(&item, 0, sizeof(item)); strcpy(item.Name, "Bronze Sword"); item.ID = 0; @@ -165,7 +165,7 @@ public: } void RetrieveBeginTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); + EQ::FixedMemoryHashSet hash(data_, size_); TEST_ASSERT(hash.exists(1000)); TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(0)); @@ -173,7 +173,7 @@ public: TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - EQEmu::ItemData item = hash[1000]; + EQ::ItemData item = hash[1000]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1000); @@ -187,8 +187,8 @@ public: } void InsertEndTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); - EQEmu::ItemData item; + EQ::FixedMemoryHashSet hash(data_, size_); + EQ::ItemData item; memset(&item, 0, sizeof(item)); strcpy(item.Name, "Jade Sword"); item.ID = 190000; @@ -204,7 +204,7 @@ public: } void RetrieveEndTest() { - EQEmu::FixedMemoryHashSet hash(data_, size_); + EQ::FixedMemoryHashSet hash(data_, size_); TEST_ASSERT(hash.exists(1000)); TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(0)); @@ -213,7 +213,7 @@ public: TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(!hash.empty()); - EQEmu::ItemData item = hash[1000]; + EQ::ItemData item = hash[1000]; TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(item.ID == 1000); diff --git a/tests/fixed_memory_variable_test.h b/tests/fixed_memory_variable_test.h index a728093ef..4bb89e1b6 100644 --- a/tests/fixed_memory_variable_test.h +++ b/tests/fixed_memory_variable_test.h @@ -48,19 +48,19 @@ public: private: void InitTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_, 501); + EQ::FixedMemoryVariableHashSet hash(data_, size_, 501); TEST_ASSERT(!hash.exists(0)); TEST_ASSERT(!hash.exists(501)); } void LoadTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); TEST_ASSERT(!hash.exists(0)); TEST_ASSERT(!hash.exists(501)); } void InsertTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); test_struct test; memset(&test, 0, sizeof(test)); strcpy(test.name, "Bill D."); @@ -71,7 +71,7 @@ public: } void RetrieveTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(!hash.exists(501)); @@ -80,7 +80,7 @@ public: } void InsertAgainTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); test_struct test; memset(&test, 0, sizeof(test)); strcpy(test.name, "Jimmy P."); @@ -91,7 +91,7 @@ public: } void RetrieveAgainTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(501)); @@ -100,7 +100,7 @@ public: } void InsertAgainFailTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); test_struct test; memset(&test, 0, sizeof(test)); strcpy(test.name, "Tommy M."); @@ -115,7 +115,7 @@ public: } void RetrieveAgainFailTest() { - EQEmu::FixedMemoryVariableHashSet hash(data_, size_); + EQ::FixedMemoryVariableHashSet hash(data_, size_); TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(501)); TEST_ASSERT(!hash.exists(500)); diff --git a/tests/ipc_mutex_test.h b/tests/ipc_mutex_test.h index d465f869c..c4323d425 100644 --- a/tests/ipc_mutex_test.h +++ b/tests/ipc_mutex_test.h @@ -40,24 +40,24 @@ public: private: void LockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex1"); + EQ::IPCMutex mutex("TestMutex1"); TEST_ASSERT(mutex.Lock()); TEST_ASSERT(mutex.Unlock()); } void UnlockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex2"); + EQ::IPCMutex mutex("TestMutex2"); TEST_ASSERT(!mutex.Unlock()); } void DoubleLockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex3"); + EQ::IPCMutex mutex("TestMutex3"); TEST_ASSERT(mutex.Lock()); TEST_ASSERT(!mutex.Lock()); } void DoubleUnlockMutexTest() { - EQEmu::IPCMutex mutex("TestMutex4"); + EQ::IPCMutex mutex("TestMutex4"); TEST_ASSERT(mutex.Lock()); TEST_ASSERT(mutex.Unlock()); TEST_ASSERT(!mutex.Unlock()); diff --git a/tests/memory_mapped_file_test.h b/tests/memory_mapped_file_test.h index 3ce61d44e..b23f6568d 100644 --- a/tests/memory_mapped_file_test.h +++ b/tests/memory_mapped_file_test.h @@ -35,7 +35,7 @@ public: private: void LoadAndZeroMMF() { - EQEmu::MemoryMappedFile mmf("testfile.txt", 512); + EQ::MemoryMappedFile mmf("testfile.txt", 512); mmf.ZeroFile(); TEST_ASSERT(mmf.Size() == 512); @@ -46,7 +46,7 @@ public: } void LoadExistingMMF() { - EQEmu::MemoryMappedFile mmf("testfile.txt"); + EQ::MemoryMappedFile mmf("testfile.txt"); TEST_ASSERT(mmf.Size() == 512); unsigned char *data = reinterpret_cast(mmf.Get()); diff --git a/tests/skills_util_test.h b/tests/skills_util_test.h index 478de4206..77616ea14 100644 --- a/tests/skills_util_test.h +++ b/tests/skills_util_test.h @@ -35,13 +35,13 @@ public: private: void IsTradeskill() { - TEST_ASSERT(EQEmu::skills::IsTradeskill(EQEmu::skills::SkillPottery)); - TEST_ASSERT(!EQEmu::skills::IsTradeskill(EQEmu::skills::SkillParry)); + TEST_ASSERT(EQ::skills::IsTradeskill(EQ::skills::SkillPottery)); + TEST_ASSERT(!EQ::skills::IsTradeskill(EQ::skills::SkillParry)); } void IsSpecializedSkill() { - TEST_ASSERT(EQEmu::skills::IsSpecializedSkill(EQEmu::skills::SkillSpecializeConjuration)); - TEST_ASSERT(!EQEmu::skills::IsSpecializedSkill(EQEmu::skills::SkillConjuration)) + TEST_ASSERT(EQ::skills::IsSpecializedSkill(EQ::skills::SkillSpecializeConjuration)); + TEST_ASSERT(!EQ::skills::IsSpecializedSkill(EQ::skills::SkillConjuration)) } };