summaryrefslogtreecommitdiff
path: root/core/tests
diff options
context:
space:
mode:
authorFelix Morgner <felix.morgner@gmail.com>2025-05-01 15:17:53 +0200
committerFelix Morgner <felix.morgner@gmail.com>2025-05-01 15:17:53 +0200
commit9e3c6314236d8c59e7bba41c3d01a1e7fbc8b092 (patch)
tree79f2e00a785a289c5eee5cbff97d97c24f3a5c7a /core/tests
parent27f8edb8b311de1fee9d9707fc461519a380d140 (diff)
downloadturns-9e3c6314236d8c59e7bba41c3d01a1e7fbc8b092.tar.xz
turns-9e3c6314236d8c59e7bba41c3d01a1e7fbc8b092.zip
core: rename disposition to Disposition
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/disposition.cpp12
-rw-r--r--core/tests/participant.cpp22
-rw-r--r--core/tests/turn_order.cpp2
-rw-r--r--core/tests/turn_order_bugs.cpp2
4 files changed, 19 insertions, 19 deletions
diff --git a/core/tests/disposition.cpp b/core/tests/disposition.cpp
index fda605c..dfab1f7 100644
--- a/core/tests/disposition.cpp
+++ b/core/tests/disposition.cpp
@@ -16,14 +16,14 @@ 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")}},
- std::pair{static_cast<disposition>(std::numeric_limits<std::underlying_type_t<disposition>>::max()),
+ 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")}});
- SECTION(std::format("the presentation name for '{}' is '{}'", static_cast<std::underlying_type_t<disposition>>(value), name.c_str()))
+ SECTION(std::format("the presentation name for '{}' is '{}'", static_cast<std::underlying_type_t<Disposition>>(value), name.c_str()))
{
REQUIRE(presentation_name_for(value) == name);
}
diff --git a/core/tests/participant.cpp b/core/tests/participant.cpp
index 8c7c230..b3ae5e9 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,21 +73,21 @@ 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};
SECTION("Setting '::disposition' via proxy changes the 'disposition' value")
{
auto old = instance.property_disposition().get_value();
- instance.property_disposition() = static_cast<core::disposition>(static_cast<int>(disposition) - 1);
+ instance.property_disposition() = static_cast<core::Disposition>(static_cast<int>(disposition) - 1);
REQUIRE(instance.property_disposition() != old);
}
SECTION("Setting '::disposition' via glib changes the 'disposition' value")
{
auto old = instance.property_disposition().get_value();
- instance.set_property("disposition", static_cast<core::disposition>(static_cast<int>(disposition) - 1));
+ instance.set_property("disposition", static_cast<core::Disposition>(static_cast<int>(disposition) - 1));
REQUIRE(instance.property_disposition() != old);
}
@@ -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 a7a0be0..a7af8d0 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 d5502bc..2e8937c 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")
{