From 7a22bcd5641812d3d36280827600f3047c4e3b27 Mon Sep 17 00:00:00 2001 From: muzygosu Date: Tue, 5 May 2026 17:02:17 +0900 Subject: [PATCH] Fix demo doorway classification --- src/domain/DemoLayouts.cpp | 2 +- tests/DemoFixtureServiceTests.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/domain/DemoLayouts.cpp b/src/domain/DemoLayouts.cpp index ec72e94..0147d73 100644 --- a/src/domain/DemoLayouts.cpp +++ b/src/domain/DemoLayouts.cpp @@ -96,7 +96,7 @@ FacilityLayout2D demoFacility() { Connection2D roomConnection; roomConnection.id = Sprint1FacilityIds::OpeningConnectionId; roomConnection.floorId = Sprint1FacilityIds::FloorId; - roomConnection.kind = ConnectionKind::Opening; + roomConnection.kind = ConnectionKind::Doorway; roomConnection.fromZoneId = mainRoom.id; roomConnection.toZoneId = sideRoom.id; roomConnection.effectiveWidth = 3.0; diff --git a/tests/DemoFixtureServiceTests.cpp b/tests/DemoFixtureServiceTests.cpp index f1551b0..a5bf309 100644 --- a/tests/DemoFixtureServiceTests.cpp +++ b/tests/DemoFixtureServiceTests.cpp @@ -19,6 +19,14 @@ bool containsConnectionKind( }); } +std::size_t countConnectionKind( + const std::vector& connections, + safecrowd::domain::ConnectionKind kind) { + return static_cast(std::count_if(connections.begin(), connections.end(), [&](const auto& connection) { + return connection.kind == kind; + })); +} + bool containsZoneId( const std::vector& zones, const std::string& id) { @@ -72,7 +80,7 @@ SC_TEST(DemoFixtureServiceBuildsSprint1Fixture) { })); SC_EXPECT_EQ(layout.connections.size(), std::size_t{3}); - SC_EXPECT_TRUE(containsConnectionKind(layout.connections, safecrowd::domain::ConnectionKind::Opening)); + SC_EXPECT_EQ(countConnectionKind(layout.connections, safecrowd::domain::ConnectionKind::Doorway), std::size_t{2}); SC_EXPECT_TRUE(containsConnectionKind(layout.connections, safecrowd::domain::ConnectionKind::Doorway)); SC_EXPECT_TRUE(containsConnectionKind(layout.connections, safecrowd::domain::ConnectionKind::Exit)); SC_EXPECT_EQ(layout.barriers.size(), std::size_t{14});