pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 19:51:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix for broken tests

Browse Source
This commit is contained in:
KimLS 2020-05-17 19:10:12 -07:00
parent 2fbd5aaccc
commit c330904695
6 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/data_verification_test.h
View File

@ -40,13 +40,13 @@ public:
float value_f = 500.0f; float value_f = 500.0f;
int value_i = 500; int value_i = 500;
float vf1 = EQEmu::Clamp(value_f, 0.0f, 1000.0f); float vf1 = EQ::Clamp(value_f, 0.0f, 1000.0f);
float vf2 = EQEmu::Clamp(value_f, 0.0f, 250.0f); float vf2 = EQ::Clamp(value_f, 0.0f, 250.0f);
float vf3 = EQEmu::Clamp(value_f, 750.0f, 1000.0f); float vf3 = EQ::Clamp(value_f, 750.0f, 1000.0f);
int vi1 = EQEmu::Clamp(value_i, 0, 1000); int vi1 = EQ::Clamp(value_i, 0, 1000);
int vi2 = EQEmu::Clamp(value_i, 0, 250); int vi2 = EQ::Clamp(value_i, 0, 250);
int vi3 = EQEmu::Clamp(value_i, 750, 1000); int vi3 = EQ::Clamp(value_i, 750, 1000);
TEST_ASSERT_EQUALS(vf1, 500.0f); TEST_ASSERT_EQUALS(vf1, 500.0f);
TEST_ASSERT_EQUALS(vf2, 250.0f); TEST_ASSERT_EQUALS(vf2, 250.0f);
@ -61,11 +61,11 @@ public:
float value_f = 500.0f; float value_f = 500.0f;
int value_i = 500; int value_i = 500;
float vf1 = EQEmu::ClampUpper(value_f, 1000.0f); float vf1 = EQ::ClampUpper(value_f, 1000.0f);
float vf2 = EQEmu::ClampUpper(value_f, 250.0f); float vf2 = EQ::ClampUpper(value_f, 250.0f);
int vi1 = EQEmu::ClampUpper(value_i, 1000); int vi1 = EQ::ClampUpper(value_i, 1000);
int vi2 = EQEmu::ClampUpper(value_i, 250); int vi2 = EQ::ClampUpper(value_i, 250);
TEST_ASSERT_EQUALS(vf1, 500.0f); TEST_ASSERT_EQUALS(vf1, 500.0f);
TEST_ASSERT_EQUALS(vf2, 250.0f); TEST_ASSERT_EQUALS(vf2, 250.0f);
@ -78,11 +78,11 @@ public:
float value_f = 500.0f; float value_f = 500.0f;
int value_i = 500; int value_i = 500;
float vf1 = EQEmu::ClampLower(value_f, 0.0f); float vf1 = EQ::ClampLower(value_f, 0.0f);
float vf2 = EQEmu::ClampLower(value_f, 750.0f); float vf2 = EQ::ClampLower(value_f, 750.0f);
int vi1 = EQEmu::ClampLower(value_i, 0); int vi1 = EQ::ClampLower(value_i, 0);
int vi2 = EQEmu::ClampLower(value_i, 750); int vi2 = EQ::ClampLower(value_i, 750);
TEST_ASSERT_EQUALS(vf1, 500.0f); TEST_ASSERT_EQUALS(vf1, 500.0f);
TEST_ASSERT_EQUALS(vf2, 750.0f); TEST_ASSERT_EQUALS(vf2, 750.0f);
@ -95,13 +95,13 @@ public:
float value_f = 500.0f; float value_f = 500.0f;
int value_i = 500; int value_i = 500;
TEST_ASSERT(EQEmu::ValueWithin(value_f, 0.0f, 1000.0f)); TEST_ASSERT(EQ::ValueWithin(value_f, 0.0f, 1000.0f));
TEST_ASSERT(!EQEmu::ValueWithin(value_f, 0.0f, 400.0f)); TEST_ASSERT(!EQ::ValueWithin(value_f, 0.0f, 400.0f));
TEST_ASSERT(!EQEmu::ValueWithin(value_f, 600.0f, 900.0f)); TEST_ASSERT(!EQ::ValueWithin(value_f, 600.0f, 900.0f));
TEST_ASSERT(EQEmu::ValueWithin(value_i, 0, 1000)); TEST_ASSERT(EQ::ValueWithin(value_i, 0, 1000));
TEST_ASSERT(!EQEmu::ValueWithin(value_i, 0, 400)); TEST_ASSERT(!EQ::ValueWithin(value_i, 0, 400));
TEST_ASSERT(!EQEmu::ValueWithin(value_i, 600, 900)); TEST_ASSERT(!EQ::ValueWithin(value_i, 600, 900));
} }
}; };

46
tests/fixed_memory_test.h
View File

@ -27,7 +27,7 @@ class FixedMemoryHashTest : public Test::Suite {
typedef void(FixedMemoryHashTest::*TestFunction)(void); typedef void(FixedMemoryHashTest::*TestFunction)(void);
public: public:
FixedMemoryHashTest() { FixedMemoryHashTest() {
size_ = EQEmu::FixedMemoryHashSet<EQEmu::ItemData>::estimated_size(72000, 190000); size_ = EQ::FixedMemoryHashSet<EQ::ItemData>::estimated_size(72000, 190000);
data_ = new uint8[size_]; data_ = new uint8[size_];
memset(data_, 0, size_); memset(data_, 0, size_);
TEST_ADD(FixedMemoryHashTest::InitTest); TEST_ADD(FixedMemoryHashTest::InitTest);
@ -49,7 +49,7 @@ public:
private: private:
void InitTest() { void InitTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_, 72000, 190000); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_, 72000, 190000);
TEST_ASSERT(!hash.exists(1001)); TEST_ASSERT(!hash.exists(1001));
TEST_ASSERT(hash.size() == 0); TEST_ASSERT(hash.size() == 0);
TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(hash.max_size() == 72000);
@ -57,7 +57,7 @@ public:
} }
void LoadTest() { void LoadTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
TEST_ASSERT(!hash.exists(1001)); TEST_ASSERT(!hash.exists(1001));
TEST_ASSERT(hash.size() == 0); TEST_ASSERT(hash.size() == 0);
TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(hash.max_size() == 72000);
@ -65,8 +65,8 @@ public:
} }
void InsertTest() { void InsertTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
EQEmu::ItemData item; EQ::ItemData item;
memset(&item, 0, sizeof(item)); memset(&item, 0, sizeof(item));
strcpy(item.Name, "Iron Sword"); strcpy(item.Name, "Iron Sword");
item.ID = 1001; item.ID = 1001;
@ -79,20 +79,20 @@ public:
} }
void RetrieveTest() { void RetrieveTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(1001));
TEST_ASSERT(hash.size() == 1); TEST_ASSERT(hash.size() == 1);
TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(hash.max_size() == 72000);
TEST_ASSERT(!hash.empty()); TEST_ASSERT(!hash.empty());
EQEmu::ItemData item = hash[1001]; EQ::ItemData item = hash[1001];
TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0);
TEST_ASSERT(item.ID == 1001); TEST_ASSERT(item.ID == 1001);
} }
void OverwriteTest() { void OverwriteTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
EQEmu::ItemData item; EQ::ItemData item;
memset(&item, 0, sizeof(item)); memset(&item, 0, sizeof(item));
strcpy(item.Name, "Steel Sword"); strcpy(item.Name, "Steel Sword");
item.ID = 1001; item.ID = 1001;
@ -105,20 +105,20 @@ public:
} }
void OverwriteRetrieveTest() { void OverwriteRetrieveTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(1001));
TEST_ASSERT(hash.size() == 1); TEST_ASSERT(hash.size() == 1);
TEST_ASSERT((hash.max_size() == 72000)); TEST_ASSERT((hash.max_size() == 72000));
TEST_ASSERT(!hash.empty()); TEST_ASSERT(!hash.empty());
EQEmu::ItemData item = hash[1001]; EQ::ItemData item = hash[1001];
TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0); TEST_ASSERT(strcmp(item.Name, "Steel Sword") == 0);
TEST_ASSERT(item.ID == 1001); TEST_ASSERT(item.ID == 1001);
} }
void InsertAgainTest() { void InsertAgainTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
EQEmu::ItemData item; EQ::ItemData item;
memset(&item, 0, sizeof(item)); memset(&item, 0, sizeof(item));
strcpy(item.Name, "Iron Sword"); strcpy(item.Name, "Iron Sword");
item.ID = 1000; item.ID = 1000;
@ -132,14 +132,14 @@ public:
} }
void RetrieveAgainTest() { void RetrieveAgainTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
TEST_ASSERT(hash.exists(1000)); TEST_ASSERT(hash.exists(1000));
TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(1001));
TEST_ASSERT(hash.size() == 2); TEST_ASSERT(hash.size() == 2);
TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(hash.max_size() == 72000);
TEST_ASSERT(!hash.empty()); TEST_ASSERT(!hash.empty());
EQEmu::ItemData item = hash[1000]; EQ::ItemData item = hash[1000];
TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0);
TEST_ASSERT(item.ID == 1000); TEST_ASSERT(item.ID == 1000);
@ -149,8 +149,8 @@ public:
} }
void InsertBeginTest() { void InsertBeginTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
EQEmu::ItemData item; EQ::ItemData item;
memset(&item, 0, sizeof(item)); memset(&item, 0, sizeof(item));
strcpy(item.Name, "Bronze Sword"); strcpy(item.Name, "Bronze Sword");
item.ID = 0; item.ID = 0;
@ -165,7 +165,7 @@ public:
} }
void RetrieveBeginTest() { void RetrieveBeginTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
TEST_ASSERT(hash.exists(1000)); TEST_ASSERT(hash.exists(1000));
TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(1001));
TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(0));
@ -173,7 +173,7 @@ public:
TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(hash.max_size() == 72000);
TEST_ASSERT(!hash.empty()); TEST_ASSERT(!hash.empty());
EQEmu::ItemData item = hash[1000]; EQ::ItemData item = hash[1000];
TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0);
TEST_ASSERT(item.ID == 1000); TEST_ASSERT(item.ID == 1000);
@ -187,8 +187,8 @@ public:
} }
void InsertEndTest() { void InsertEndTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
EQEmu::ItemData item; EQ::ItemData item;
memset(&item, 0, sizeof(item)); memset(&item, 0, sizeof(item));
strcpy(item.Name, "Jade Sword"); strcpy(item.Name, "Jade Sword");
item.ID = 190000; item.ID = 190000;
@ -204,7 +204,7 @@ public:
} }
void RetrieveEndTest() { void RetrieveEndTest() {
EQEmu::FixedMemoryHashSet<EQEmu::ItemData> hash(data_, size_); EQ::FixedMemoryHashSet<EQ::ItemData> hash(data_, size_);
TEST_ASSERT(hash.exists(1000)); TEST_ASSERT(hash.exists(1000));
TEST_ASSERT(hash.exists(1001)); TEST_ASSERT(hash.exists(1001));
TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(0));
@ -213,7 +213,7 @@ public:
TEST_ASSERT(hash.max_size() == 72000); TEST_ASSERT(hash.max_size() == 72000);
TEST_ASSERT(!hash.empty()); TEST_ASSERT(!hash.empty());
EQEmu::ItemData item = hash[1000]; EQ::ItemData item = hash[1000];
TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0); TEST_ASSERT(strcmp(item.Name, "Iron Sword") == 0);
TEST_ASSERT(item.ID == 1000); TEST_ASSERT(item.ID == 1000);

16
tests/fixed_memory_variable_test.h
View File

@ -48,19 +48,19 @@ public:
private: private:
void InitTest() { void InitTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_, 501); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_, 501);
TEST_ASSERT(!hash.exists(0)); TEST_ASSERT(!hash.exists(0));
TEST_ASSERT(!hash.exists(501)); TEST_ASSERT(!hash.exists(501));
} }
void LoadTest() { void LoadTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
TEST_ASSERT(!hash.exists(0)); TEST_ASSERT(!hash.exists(0));
TEST_ASSERT(!hash.exists(501)); TEST_ASSERT(!hash.exists(501));
} }
void InsertTest() { void InsertTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
test_struct test; test_struct test;
memset(&test, 0, sizeof(test)); memset(&test, 0, sizeof(test));
strcpy(test.name, "Bill D."); strcpy(test.name, "Bill D.");
@ -71,7 +71,7 @@ public:
} }
void RetrieveTest() { void RetrieveTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(0));
TEST_ASSERT(!hash.exists(501)); TEST_ASSERT(!hash.exists(501));
@ -80,7 +80,7 @@ public:
} }
void InsertAgainTest() { void InsertAgainTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
test_struct test; test_struct test;
memset(&test, 0, sizeof(test)); memset(&test, 0, sizeof(test));
strcpy(test.name, "Jimmy P."); strcpy(test.name, "Jimmy P.");
@ -91,7 +91,7 @@ public:
} }
void RetrieveAgainTest() { void RetrieveAgainTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(0));
TEST_ASSERT(hash.exists(501)); TEST_ASSERT(hash.exists(501));
@ -100,7 +100,7 @@ public:
} }
void InsertAgainFailTest() { void InsertAgainFailTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
test_struct test; test_struct test;
memset(&test, 0, sizeof(test)); memset(&test, 0, sizeof(test));
strcpy(test.name, "Tommy M."); strcpy(test.name, "Tommy M.");
@ -115,7 +115,7 @@ public:
} }
void RetrieveAgainFailTest() { void RetrieveAgainFailTest() {
EQEmu::FixedMemoryVariableHashSet<test_struct> hash(data_, size_); EQ::FixedMemoryVariableHashSet<test_struct> hash(data_, size_);
TEST_ASSERT(hash.exists(0)); TEST_ASSERT(hash.exists(0));
TEST_ASSERT(hash.exists(501)); TEST_ASSERT(hash.exists(501));
TEST_ASSERT(!hash.exists(500)); TEST_ASSERT(!hash.exists(500));

8
tests/ipc_mutex_test.h
View File

@ -40,24 +40,24 @@ public:
private: private:
void LockMutexTest() { void LockMutexTest() {
EQEmu::IPCMutex mutex("TestMutex1"); EQ::IPCMutex mutex("TestMutex1");
TEST_ASSERT(mutex.Lock()); TEST_ASSERT(mutex.Lock());
TEST_ASSERT(mutex.Unlock()); TEST_ASSERT(mutex.Unlock());
} }
void UnlockMutexTest() { void UnlockMutexTest() {
EQEmu::IPCMutex mutex("TestMutex2"); EQ::IPCMutex mutex("TestMutex2");
TEST_ASSERT(!mutex.Unlock()); TEST_ASSERT(!mutex.Unlock());
} }
void DoubleLockMutexTest() { void DoubleLockMutexTest() {
EQEmu::IPCMutex mutex("TestMutex3"); EQ::IPCMutex mutex("TestMutex3");
TEST_ASSERT(mutex.Lock()); TEST_ASSERT(mutex.Lock());
TEST_ASSERT(!mutex.Lock()); TEST_ASSERT(!mutex.Lock());
} }
void DoubleUnlockMutexTest() { void DoubleUnlockMutexTest() {
EQEmu::IPCMutex mutex("TestMutex4"); EQ::IPCMutex mutex("TestMutex4");
TEST_ASSERT(mutex.Lock()); TEST_ASSERT(mutex.Lock());
TEST_ASSERT(mutex.Unlock()); TEST_ASSERT(mutex.Unlock());
TEST_ASSERT(!mutex.Unlock()); TEST_ASSERT(!mutex.Unlock());

4
tests/memory_mapped_file_test.h
View File

@ -35,7 +35,7 @@ public:
private: private:
void LoadAndZeroMMF() { void LoadAndZeroMMF() {
EQEmu::MemoryMappedFile mmf("testfile.txt", 512); EQ::MemoryMappedFile mmf("testfile.txt", 512);
mmf.ZeroFile(); mmf.ZeroFile();
TEST_ASSERT(mmf.Size() == 512); TEST_ASSERT(mmf.Size() == 512);
@ -46,7 +46,7 @@ public:
} }
void LoadExistingMMF() { void LoadExistingMMF() {
EQEmu::MemoryMappedFile mmf("testfile.txt"); EQ::MemoryMappedFile mmf("testfile.txt");
TEST_ASSERT(mmf.Size() == 512); TEST_ASSERT(mmf.Size() == 512);
unsigned char *data = reinterpret_cast<unsigned char*>(mmf.Get()); unsigned char *data = reinterpret_cast<unsigned char*>(mmf.Get());

8
tests/skills_util_test.h
View File

@ -35,13 +35,13 @@ public:
private: private:
void IsTradeskill() { void IsTradeskill() {
TEST_ASSERT(EQEmu::skills::IsTradeskill(EQEmu::skills::SkillPottery)); TEST_ASSERT(EQ::skills::IsTradeskill(EQ::skills::SkillPottery));
TEST_ASSERT(!EQEmu::skills::IsTradeskill(EQEmu::skills::SkillParry)); TEST_ASSERT(!EQ::skills::IsTradeskill(EQ::skills::SkillParry));
} }
void IsSpecializedSkill() { void IsSpecializedSkill() {
TEST_ASSERT(EQEmu::skills::IsSpecializedSkill(EQEmu::skills::SkillSpecializeConjuration)); TEST_ASSERT(EQ::skills::IsSpecializedSkill(EQ::skills::SkillSpecializeConjuration));
TEST_ASSERT(!EQEmu::skills::IsSpecializedSkill(EQEmu::skills::SkillConjuration)) TEST_ASSERT(!EQ::skills::IsSpecializedSkill(EQ::skills::SkillConjuration))
} }
}; };