Deukhoofd/PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for valgrind failure.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-02-06 16:25:55 +01:00
parent b425a7e8b9
commit 67d317e22b
14 changed files with 91 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
View File

@@ -15,7 +15,7 @@ class testScript1 {
bool testShiny(Pokemon@ p, bool shiny){ return p.Shiny == shiny; }
bool testHeldItem(Pokemon@ p, Item@ item){ return p.HeldItem is item; }
bool testCurrentHealth(Pokemon@ p, uint health){ return p.CurrentHealth == health; }
bool testNickname(Pokemon@ p, const string &in name){ return p.Nickname == name; }
bool testNickname(Pokemon@ p, const string& name){ return p.Nickname == name; }
bool testActiveAbility(Pokemon@ p, const string &in ability){ return p.ActiveAbility == ability; }
bool testIsFainted(Pokemon@ p, bool b){ return p.IsFainted == b; }
bool testType(Pokemon@ p, uint index, uint8 type){ return p.GetTypes()[index] == type; }
@@ -29,10 +29,10 @@ class testScript1 {
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
struct ScriptData {
AngelScriptScript* Script;
AngelScripResolver* Resolver;
asIScriptFunction* Func;
asIScriptContext* Context;
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
~ScriptData() {
Script->GetContextPool()->ReturnContextToPool(Context);
@@ -207,7 +207,7 @@ TEST_CASE("Validate Pokemon Active Ability in Script") {
.WithForme("default")
->WithGender(CreatureLib::Library::Gender::Male)
->Build();
data.Context->SetArgObject(0, const_cast<PkmnLib::Battling::Pokemon*>(mon));
data.Context->SetArgObject(0, (void*)mon);
auto name = mon->GetActiveTalent();
data.Context->SetArgAddress(1, &name);

13
tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
View File

@@ -20,10 +20,10 @@ class testScript1 {
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
struct ScriptData {
AngelScriptScript* Script;
AngelScripResolver* Resolver;
asIScriptFunction* Func;
asIScriptContext* Context;
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
~ScriptData() {
Script->GetContextPool()->ReturnContextToPool(Context);
@@ -32,8 +32,8 @@ struct ScriptData {
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
if (_resolverCache == nullptr){
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
if (_resolverCache == nullptr) {
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->SetCreateFunction(&_testLoadFunc);
@@ -171,5 +171,4 @@ TEST_CASE("Validate Forme GetAbility in Script") {
REQUIRE((bool)data.Context->GetReturnWord());
}
#endif

8
tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
View File

@@ -16,10 +16,10 @@ class testScript1 {
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
struct ScriptData {
AngelScriptScript* Script;
AngelScripResolver* Resolver;
asIScriptFunction* Func;
asIScriptContext* Context;
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
~ScriptData() {
Script->GetContextPool()->ReturnContextToPool(Context);

10
tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
View File

@@ -20,10 +20,10 @@ class testScript1 {
static const char* _testLoadFunc(const char* name) { return _scripts[name]; }
struct ScriptData {
AngelScriptScript* Script;
AngelScripResolver* Resolver;
asIScriptFunction* Func;
asIScriptContext* Context;
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
~ScriptData() {
Script->GetContextPool()->ReturnContextToPool(Context);
@@ -61,7 +61,7 @@ TEST_CASE("Validate Move Name in Script") {
auto data = GetScript(mainLib, "testName");
auto move = mainLib->GetMoveLibrary()->GetAttack("testMove");
data.Context->SetArgObject(0, const_cast<PkmnLib::Library::MoveData*>(move));
data.Context->SetArgObject(0, (void*)move);
auto name = move->GetName();
data.Context->SetArgAddress(1, &name);