diff options
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/disposition.cpp | 8 | ||||
| -rw-r--r-- | core/tests/participant.cpp | 18 | ||||
| -rw-r--r-- | core/tests/turn_order.cpp | 2 | ||||
| -rw-r--r-- | core/tests/turn_order_bugs.cpp | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp index dfab1f7..fadf476 100644 --- a/core/tests/disposition.cpp +++ b/core/tests/disposition.cpp @@ -16,10 +16,10 @@ namespace turns::core::tests TEST_CASE("to_presentation_name returns the correct string for the current language", "[disposition]") { - auto [value, name] = GENERATE(std::pair{Disposition::neutral, Glib::ustring{_("Neutral")}}, - std::pair{Disposition::friendly, Glib::ustring{_("Friendly")}}, - std::pair{Disposition::hostile, Glib::ustring{_("Hostile")}}, - std::pair{Disposition::secret, Glib::ustring{_("Secret")}}, + auto [value, name] = GENERATE(std::pair{Disposition::Neutral, Glib::ustring{_("Neutral")}}, + std::pair{Disposition::Friendly, Glib::ustring{_("Friendly")}}, + std::pair{Disposition::Hostile, Glib::ustring{_("Hostile")}}, + std::pair{Disposition::Secret, Glib::ustring{_("Secret")}}, std::pair{static_cast<Disposition>(std::numeric_limits<std::underlying_type_t<Disposition>>::max()), Glib::ustring{_("Unknown disposition value")}}); diff --git a/core/tests/participant.cpp b/core/tests/participant.cpp index b3ae5e9..b417e36 100644 --- a/core/tests/participant.cpp +++ b/core/tests/participant.cpp @@ -16,7 +16,7 @@ namespace turns::core::tests { auto constexpr name = "Participant #1"; auto constexpr priority = 17; - auto constexpr disposition = Disposition::friendly; + auto constexpr disposition = Disposition::Friendly; auto json = nlohmann::json::parse(R"( { @@ -33,7 +33,7 @@ namespace turns::core::tests auto instance = Participant{}; REQUIRE(instance.property_name() == ""); REQUIRE(instance.property_priority() == 0); - REQUIRE(instance.property_disposition() == Disposition::neutral); + REQUIRE(instance.property_disposition() == Disposition::Neutral); REQUIRE(!instance.property_is_active()); REQUIRE(!instance.property_is_defeated()); } @@ -73,7 +73,7 @@ namespace turns::core::tests { auto constexpr name = "Participant #2"; auto constexpr priority = 10; - auto constexpr disposition = Disposition::hostile; + auto constexpr disposition = Disposition::Hostile; auto instance = Participant{name, priority, disposition}; @@ -152,7 +152,7 @@ namespace turns::core::tests { auto constexpr constructed_name = "Vana Thistletop"; auto constexpr constructed_priority = 17; - auto constexpr constructed_disposition = Disposition::friendly; + auto constexpr constructed_disposition = Disposition::Friendly; auto instance = Participant{constructed_name, constructed_priority, constructed_disposition}; SECTION("can be created") @@ -175,8 +175,8 @@ namespace turns::core::tests SECTION("allowing to set it") { - instance.property_disposition() = Disposition::hostile; - REQUIRE(instance.property_disposition() == Disposition::hostile); + instance.property_disposition() = Disposition::Hostile; + REQUIRE(instance.property_disposition() == Disposition::Hostile); } } @@ -250,7 +250,7 @@ namespace turns::core::tests TEST_CASE("Serializing a participant") { - auto instance = Participant::create("Participant #0", 17.2, Disposition::friendly); + auto instance = Participant::create("Participant #0", 17.2, Disposition::Friendly); auto serialized = instance->serialize(); SECTION("the active state is serialized correctly") @@ -260,7 +260,7 @@ namespace turns::core::tests SECTION("the disposition is serialized correctly") { - REQUIRE(serialized.at("disposition") == Disposition::friendly); + REQUIRE(serialized.at("disposition") == Disposition::Friendly); } SECTION("the name is serialized correctly") @@ -293,7 +293,7 @@ namespace turns::core::tests SECTION("the disposition is de-serialized correctly") { - REQUIRE(instance->property_disposition() == Disposition::hostile); + REQUIRE(instance->property_disposition() == Disposition::Hostile); } SECTION("the name is de-serialized correctly") diff --git a/core/tests/turn_order.cpp b/core/tests/turn_order.cpp index a7af8d0..ceed924 100644 --- a/core/tests/turn_order.cpp +++ b/core/tests/turn_order.cpp @@ -61,7 +61,7 @@ namespace turns::core::tests GIVEN("a participant has been added to a turn_order") { - instance->add("Participant #0", 0, Disposition::neutral); + instance->add("Participant #0", 0, Disposition::Neutral); THEN("get_n_items() returns 1") { diff --git a/core/tests/turn_order_bugs.cpp b/core/tests/turn_order_bugs.cpp index 2e8937c..a79e9b4 100644 --- a/core/tests/turn_order_bugs.cpp +++ b/core/tests/turn_order_bugs.cpp @@ -19,7 +19,7 @@ namespace turns::core::tests { auto instance = turn_order::create(); - instance->add("A", 0, Disposition::neutral); + instance->add("A", 0, Disposition::Neutral); WHEN("it is started and then stepped forward, backward, forward") { |