From 565653c3f091d67fd460534f564e0b3360463129 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 2 Jan 2025 21:24:50 +0200 Subject: [PATCH] Fix water adjacency test --- tests/src/com/unciv/logic/map/FreshWaterTests.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/com/unciv/logic/map/FreshWaterTests.kt b/tests/src/com/unciv/logic/map/FreshWaterTests.kt index 5974ac551b..5597a5dd91 100644 --- a/tests/src/com/unciv/logic/map/FreshWaterTests.kt +++ b/tests/src/com/unciv/logic/map/FreshWaterTests.kt @@ -19,7 +19,7 @@ class FreshWaterTests { companion object { @Suppress("SpellCheckingInspection") private const val testingMap = "H4sIAAAAAAAA/52SwU7DMAyGX6UPkB5WxMVHBhOHSqCBdpl6CKqh1tKmit3REvXdSdVb17GIS6Qkn//f+WNf6/ZVO12joGPwMrQIT3Urgwo3b/SD4J0uqWPI1DeVUsG9qpC+KoE71YQ62HYsth7Vh2bcdwYZBbZ0Tg5Jmhx0Q8boUQkZzIkFjn7i3tE5TQ08BtrJqHxrmYRsA76HdKOGsMyKf5ITeJuLEosR6qOYqM7TbHpjtkYqmbc71NI5ZDi+aCYuFgqTwKI+1yfk1TAjjZ7DZy19Npc+8eXXrBfQbWbuIy7auKnoo1yvJFdpfrASxj7HT9nTGR2I63Dli1YbuYxuZ6wtk9aEQy4i5ecZ+o/BWIy/FE5uFvkDAAA=" - private val shouldHaveFreshWater = setOf(Vector2(-1f,-1f),Vector2(1f,1f),Vector2(-2f,-2f),Vector2(2f,2f),Vector2(-1f,-2f),Vector2(1f,2f),Vector2(2f,0f),Vector2(-2f,0f),Vector2(2f,1f),Vector2(-2f,-1f)) + private val adjacentToFreshWater = setOf(Vector2(-1f,-1f),Vector2(1f,1f),Vector2(-1f,-2f),Vector2(1f,2f),Vector2(2f,0f),Vector2(-2f,0f),Vector2(2f,1f),Vector2(-2f,-1f)) } @Before @@ -34,7 +34,7 @@ class FreshWaterTests { fun isAdjacentToFreshWater() { for (tile in map.values) { val isFresh = tile.isAdjacentTo(Constants.freshWater) - val shouldFresh = tile.position in shouldHaveFreshWater + val shouldFresh = tile.position in adjacentToFreshWater Assert.assertFalse("Tile $tile has fresh water but should not", isFresh && !shouldFresh) Assert.assertFalse("Tile $tile should have fresh water but doesn't", !isFresh && shouldFresh) }