Handle dependencies through CPM

2022-02-05 13:59:15 +01:00
parent 1c51edb2b9
commit 48b11f8179
20 changed files with 1062 additions and 6035 deletions
--- a/tests/BattleTests/ChoiceQueueTests.cpp
+++ b/tests/BattleTests/ChoiceQueueTests.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD

-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Flow/ChoiceQueue.hpp"
 #include "../../src/Battling/Models/BattleSide.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
--- a/tests/BattleTests/ChoiceSetTests.cpp
+++ b/tests/BattleTests/ChoiceSetTests.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD

-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/BattleSide.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
--- a/tests/BattleTests/CloneTests.cpp
+++ b/tests/BattleTests/CloneTests.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD

-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/History/HistoryElements/AttackUseHistory.hpp"
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/BattleSide.hpp"
--- a/tests/BattleTests/CreaturePartyTests.cpp
+++ b/tests/BattleTests/CreaturePartyTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/CreateCreature.hpp"
 #include "../../src/Battling/Models/CreatureParty.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
--- a/tests/BattleTests/CreatureTests.cpp
+++ b/tests/BattleTests/CreatureTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
--- a/tests/BattleTests/EventHookTests.cpp
+++ b/tests/BattleTests/EventHookTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/EventHooks/EventDataClasses.hpp"
 #include "../../src/Battling/EventHooks/EventHook.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
--- a/tests/BattleTests/ScriptTests/ScriptAggregatorTests.cpp
+++ b/tests/BattleTests/ScriptTests/ScriptAggregatorTests.cpp
@@ -1,7 +1,6 @@
 #ifdef TESTS_BUILD

-#include <utility>
-#include "../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../src/Battling/ScriptHandling/ScriptAggregator.hpp"

 using namespace CreatureLib;
--- a/tests/BattleTests/ScriptTests/ScriptSetTests.cpp
+++ b/tests/BattleTests/ScriptTests/ScriptSetTests.cpp
@@ -1,7 +1,6 @@
 #ifdef TESTS_BUILD

-#include <utility>
-#include "../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../src/Battling/ScriptHandling/ScriptSet.hpp"

 using namespace CreatureLib;
--- a/tests/BattleTests/ScriptTests/ScriptSourceTest.cpp
+++ b/tests/BattleTests/ScriptTests/ScriptSourceTest.cpp
@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD

 #include "../../../src/Battling/ScriptHandling/ScriptSource.hpp"
-#include "../../../extern/doctest.hpp"
+#include <doctest.h>

 using namespace CreatureLib;
 using namespace CreatureLib::Battling;
--- a/tests/BattleTests/TurnOrderTests.cpp
+++ b/tests/BattleTests/TurnOrderTests.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD

-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Flow/TurnOrdering.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
 #include "../../src/Battling/TurnChoices/AttackTurnChoice.hpp"
--- a/tests/ExceptionTests.cpp
+++ b/tests/ExceptionTests.cpp
@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD
 #include <cstring>
+#include <doctest.h>
 #include "../CInterface/Core.hpp"
-#include "../extern/doctest.hpp"

 TEST_CASE("When throwing exception, what() is readable") {
    bool hasCaught = false;
--- a/tests/Integration/BattleIntegrations.cpp
+++ b/tests/Integration/BattleIntegrations.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/BattleParty.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
--- a/tests/LibraryTests/BaseLibraryTests.cpp
+++ b/tests/LibraryTests/BaseLibraryTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/BaseLibrary.hpp"
 #include "../TestLibrary/TestLibrary.hpp"

--- a/tests/LibraryTests/EffectParameterTests.cpp
+++ b/tests/LibraryTests/EffectParameterTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/EffectParameter.hpp"

 using namespace CreatureLib::Library;
--- a/tests/LibraryTests/SpeciesTest.cpp
+++ b/tests/LibraryTests/SpeciesTest.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD

-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/CreatureData/CreatureSpecies.hpp"

 using namespace CreatureLib::Library;
--- a/tests/LibraryTests/TestLibraryTests.cpp
+++ b/tests/LibraryTests/TestLibraryTests.cpp
@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN

-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../TestLibrary/TestLibrary.hpp"

 TEST_CASE("Can Create Attack Library") {