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

Fixed spelling error in AngelScriptResolver name.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-24 00:05:43 +02:00
parent 1d5c6d696e
commit 42ea76cf53
12 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/ScriptTests/BaseScriptClassTests.cpp
View File

@@ -1,7 +1,7 @@
#ifdef TESTS_BUILD
#include "../../extern/catch.hpp"
#include "../../src/Battling/Pokemon/CreatePokemon.hpp"
#include "../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../TestLibrary/TestLibrary.hpp"
#define AS_CLASS(name, contents) \
@@ -75,10 +75,10 @@ void StopBeforeAttack(ExecutingMove@ attack, bool& result) override{
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
if (_resolverCache == nullptr) {
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
for (auto kv : _scripts) {
_resolverCache->CreateScript(kv.first, kv.second);

12
tests/ScriptTests/ScriptResolverTests.cpp
View File

@@ -1,6 +1,6 @@
#ifdef TESTS_BUILD
#include "../../extern/catch.hpp"
#include "../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -28,7 +28,7 @@ TEST_CASE("Get a script resolver, initialize it, then delete it") {
}
TEST_CASE("Get a script resolver, set script load function, load script, then build module") {
auto lib = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
auto lib = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
lib->Initialize(TestLibrary::GetLibrary());
lib->CreateScript("testScript1", _scripts["testScript1"]);
lib->FinalizeModule();
@@ -36,7 +36,7 @@ TEST_CASE("Get a script resolver, set script load function, load script, then bu
}
TEST_CASE("Build script resolver, then create object") {
auto lib = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
auto lib = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
lib->Initialize(TestLibrary::GetLibrary());
lib->CreateScript("testScript1", _scripts["testScript1"]);
lib->FinalizeModule();
@@ -48,7 +48,7 @@ TEST_CASE("Build script resolver, then create object") {
}
TEST_CASE("Build script resolver, create object, invoke addition method") {
auto lib = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
auto lib = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
lib->Initialize(TestLibrary::GetLibrary());
lib->CreateScript("testScript1", _scripts["testScript1"]);
lib->FinalizeModule();
@@ -79,7 +79,7 @@ TEST_CASE("Build script resolver, create object, invoke addition method") {
}
TEST_CASE("Get a script resolver, save the byte code to memory, create new script resolver from it") {
auto originLib = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
auto originLib = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
originLib->Initialize(TestLibrary::GetLibrary());
originLib->CreateScript("testScript1", _scripts["testScript1"]);
originLib->FinalizeModule();
@@ -97,7 +97,7 @@ TEST_CASE("Get a script resolver, save the byte code to memory, create new scrip
types.Insert(innerDb.first, newInnerDb);
}
auto newLib = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
auto newLib = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
newLib->Initialize(TestLibrary::GetLibrary());
newLib->LoadByteCodeFromMemory(byteCode, size, types);
auto obj = dynamic_cast<AngelScriptScript*>(newLib->LoadScript(ScriptCategory::Creature, "testScript1"_cnc));

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

@@ -1,7 +1,7 @@
#ifdef TESTS_BUILD
#include "../../../../extern/catch.hpp"
#include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../../../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -32,7 +32,7 @@ class testScript1 {
struct ScriptData {
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
AngelScriptResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
@@ -42,10 +42,10 @@ struct ScriptData {
}
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
if (_resolverCache == nullptr) {
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
_resolverCache->FinalizeModule();

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

@@ -1,6 +1,6 @@
#ifdef TESTS_BUILD
#include "../../../../extern/catch.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../../../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -21,7 +21,7 @@ class testScript1 {
struct ScriptData {
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
AngelScriptResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
@@ -31,10 +31,10 @@ struct ScriptData {
}
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
if (_resolverCache == nullptr){
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
_resolverCache->FinalizeModule();

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

@@ -1,6 +1,6 @@
#ifdef TESTS_BUILD
#include "../../../../extern/catch.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../../../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -17,7 +17,7 @@ class testScript1 {
struct ScriptData {
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
AngelScriptResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
@@ -27,10 +27,10 @@ struct ScriptData {
}
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
if (_resolverCache == nullptr){
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
_resolverCache->FinalizeModule();

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

@@ -1,6 +1,6 @@
#ifdef TESTS_BUILD
#include "../../../../extern/catch.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../../../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -21,7 +21,7 @@ class testScript1 {
struct ScriptData {
AngelScriptScript* Script = nullptr;
AngelScripResolver* Resolver = nullptr;
AngelScriptResolver* Resolver = nullptr;
asIScriptFunction* Func = nullptr;
asIScriptContext* Context = nullptr;
@@ -31,10 +31,10 @@ struct ScriptData {
}
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
if (_resolverCache == nullptr){
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
_resolverCache->FinalizeModule();

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

@@ -1,6 +1,6 @@
#ifdef TESTS_BUILD
#include "../../../../extern/catch.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../../../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -19,7 +19,7 @@ class testScript1 {
struct ScriptData {
AngelScriptScript* Script;
AngelScripResolver* Resolver;
AngelScriptResolver* Resolver;
asIScriptFunction* Func;
asIScriptContext* Context;
@@ -29,10 +29,10 @@ struct ScriptData {
}
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
if (_resolverCache == nullptr){
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
_resolverCache->FinalizeModule();

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

@@ -1,6 +1,6 @@
#ifdef TESTS_BUILD
#include "../../../../extern/catch.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
#include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
#include "../../../TestLibrary/TestLibrary.hpp"
static std::unordered_map<const char*, const char*> _scripts =
@@ -20,7 +20,7 @@ class testScript1 {
struct ScriptData {
AngelScriptScript* Script;
AngelScripResolver* Resolver;
AngelScriptResolver* Resolver;
asIScriptFunction* Func;
asIScriptContext* Context;
@@ -30,10 +30,10 @@ struct ScriptData {
}
};
static AngelScripResolver* _resolverCache = nullptr;
static AngelScripResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
static AngelScriptResolver* _resolverCache = nullptr;
static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
if (_resolverCache == nullptr){
_resolverCache = dynamic_cast<AngelScripResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
_resolverCache->Initialize(mainLib);
_resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
_resolverCache->FinalizeModule();