From a37391781a96f0555ba058c1a4d60c9dad7d14c6 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 3 Apr 2023 13:56:13 +0300 Subject: [PATCH] Fixed tests --- .../civilization/CapitalConnectionsFinderTests.kt | 12 ++++++------ tests/src/com/unciv/logic/map/UnitMovementTests.kt | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt index 63ebf29b42..731917b70e 100644 --- a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt +++ b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt @@ -34,7 +34,7 @@ import org.junit.runner.RunWith class CapitalConnectionsFinderTests { private var gameInfo = GameInfo() - private val testCivilizationNames = arrayListOf("America", "Germany", "Greece") + private val testCivilizationNames = arrayListOf("America", "Germany", "Greece","Hanoi", "Genoa") private var rules = Ruleset() private fun ourCiv() = gameInfo.civilizations.first() @@ -195,16 +195,16 @@ class CapitalConnectionsFinderTests { createCity(ourCiv(), Vector2(0f, -4f), "Not connected"), createCity(ourCiv(), Vector2(0f, 4f), "Connected")) - val openCiv = gameInfo.getCivilization("Germany") - openCiv.nation.cityStateType = "Cultured" + val openCiv = gameInfo.getCivilization("Hanoi") +// openCiv.nation.cityStateType = "Cultured" openCiv.cities = listOf( createCity(openCiv, Vector2(0f, 2f), "Berlin", true)) - ourCiv().diplomacy["Germany"] = DiplomacyManager(ourCiv(), "Germany") + ourCiv().diplomacy["Hanoi"] = DiplomacyManager(ourCiv(), "Hanoi") .apply { diplomaticStatus = DiplomaticStatus.Peace } - val closedCiv = gameInfo.getCivilization("Greece") + val closedCiv = gameInfo.getCivilization("Genoa") closedCiv.nation.cityStateType = "Cultured" closedCiv.cities = listOf( createCity(closedCiv, Vector2(0f, -2f), "Athens", true)) - ourCiv().diplomacy["Greece"] = DiplomacyManager(ourCiv(), "Greece") + ourCiv().diplomacy["Genoa"] = DiplomacyManager(ourCiv(), "Genoa") .apply { diplomaticStatus = DiplomaticStatus.War } diff --git a/tests/src/com/unciv/logic/map/UnitMovementTests.kt b/tests/src/com/unciv/logic/map/UnitMovementTests.kt index fb2554b817..3c315f5e2c 100644 --- a/tests/src/com/unciv/logic/map/UnitMovementTests.kt +++ b/tests/src/com/unciv/logic/map/UnitMovementTests.kt @@ -280,6 +280,7 @@ class UnitMovementTests { position.set(0f, i.toFloat()) tile.tileMap.tileMatrix.last().add(this) newTiles.add(this) + setTerrainTransients() } } // allow this tile to be teleported to