summaryrefslogtreecommitdiff
path: root/lib/tests/turnsmm/turn-order.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tests/turnsmm/turn-order.cpp')
-rw-r--r--lib/tests/turnsmm/turn-order.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/tests/turnsmm/turn-order.cpp b/lib/tests/turnsmm/turn-order.cpp
index fcb7727..ac3eb77 100644
--- a/lib/tests/turnsmm/turn-order.cpp
+++ b/lib/tests/turnsmm/turn-order.cpp
@@ -4,8 +4,6 @@
#include <catch2/catch_test_macros.hpp>
-#include <turnsmm/enums.hpp>
-
#include <cstddef>
#include <tuple>
@@ -45,7 +43,7 @@ SCENARIO("Creating a turn order", "[lib][object][lifetime]")
THEN("its sort mode is descending")
{
- REQUIRE(instance.get_sort_mode() == Turns::SortMode::Descending);
+ REQUIRE(instance.get_sort_mode() == Turns::TurnOrder::SortMode::Descending);
}
}
}
@@ -59,7 +57,7 @@ SCENARIO("Modifying a turn order", "[lib][object][data]")
WHEN("a participant is added")
{
- auto participant = Turns::Participant::create("Test Participant", 10.0f, Turns::Disposition::Friendly);
+ auto participant = Turns::Participant::create("Test Participant", 10.0f, Turns::Participant::Disposition::Friendly);
instance.add(participant);
THEN("its participant count is 1")
@@ -87,7 +85,7 @@ SCENARIO("Modifying a turn order", "[lib][object][data]")
THEN("its sort mode is descending")
{
- REQUIRE(instance.get_sort_mode() == Turns::SortMode::Descending);
+ REQUIRE(instance.get_sort_mode() == Turns::TurnOrder::SortMode::Descending);
}
}
}
@@ -98,8 +96,8 @@ SCENARIO("Sorting a turn order")
GIVEN("A turn order with two participants - A/10/H and B/20/N")
{
auto instance = Turns::TurnOrder{};
- auto participant_a = Turns::Participant::create("A", 10, Turns::Disposition::Hostile);
- auto participant_b = Turns::Participant::create("B", 20, Turns::Disposition::Neutral);
+ auto participant_a = Turns::Participant::create("A", 10, Turns::Participant::Disposition::Hostile);
+ auto participant_b = Turns::Participant::create("B", 20, Turns::Participant::Disposition::Neutral);
instance.add(participant_a);
instance.add(participant_b);
@@ -157,7 +155,7 @@ SCENARIO("Sorting a turn order")
WHEN("the sort mode is changed to ascending")
{
- instance.set_sort_mode(Turns::SortMode::Ascending);
+ instance.set_sort_mode(Turns::TurnOrder::SortMode::Ascending);
THEN("A is the first and B the second element")
{
@@ -180,7 +178,7 @@ SCENARIO("Sorting a turn order")
AND_WHEN("the sort mode is changed to ascending")
{
- instance.set_sort_mode(Turns::SortMode::Ascending);
+ instance.set_sort_mode(Turns::TurnOrder::SortMode::Ascending);
THEN("the signal is notified")
{