From 35c19bf9de99ed434079ef22ef9dc1bd2e008104 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 31 Dec 2023 22:59:33 +0200 Subject: [PATCH] Fixed tests --- core/src/com/unciv/logic/map/tile/TileStatFunctions.kt | 5 ++--- .../unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt | 3 ++- tests/src/com/unciv/testing/BasicTests.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt index cb2fdd7849..14ddc8fc44 100644 --- a/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt +++ b/core/src/com/unciv/logic/map/tile/TileStatFunctions.kt @@ -10,7 +10,6 @@ import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats -import com.unciv.models.translations.tr import com.unciv.ui.components.extensions.toPercent fun Iterable>.toStats(): Stats { @@ -59,7 +58,7 @@ class TileStatFunctions(val tile: Tile) { for (unique in statsFromTilesUniques + statsFromObjectsUniques) { val tileType = unique.params[1] if (!tile.matchesTerrainFilter(tileType, observingCiv)) continue - listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})".tr() to unique.stats) + listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})" to unique.stats) } for (unique in localUniqueCache.forCityGetMatchingUniques( @@ -69,7 +68,7 @@ class TileStatFunctions(val tile: Tile) { !tile.matchesTerrainFilter(unique.params[2]) && city.matchesFilter(unique.params[3]) ) - listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})".tr() to unique.stats) + listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})" to unique.stats) } } diff --git a/core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt b/core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt index 29748aa17c..eebf2dd6c0 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt @@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.Align import com.unciv.UncivGame import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.tile.TileDescription +import com.unciv.models.translations.tr import com.unciv.ui.components.extensions.addBorderAllowOpacity import com.unciv.ui.components.extensions.darken import com.unciv.ui.components.extensions.toLabel @@ -64,7 +65,7 @@ class TileInfoTable(private val worldScreen: WorldScreen) : Table(BaseScreen.ski table.onClick { Popup(worldScreen).apply { for ((name, stats) in tile.stats.getTileStatsBreakdown(tile.getCity(), viewingCiv)) - add("{$name}: {${stats.clone()}}".toLabel()).row() + add("${name.tr()}: {${stats.clone()}}".toLabel()).row() addCloseButton() }.open() } diff --git a/tests/src/com/unciv/testing/BasicTests.kt b/tests/src/com/unciv/testing/BasicTests.kt index d468cf92a3..063cab72ea 100644 --- a/tests/src/com/unciv/testing/BasicTests.kt +++ b/tests/src/com/unciv/testing/BasicTests.kt @@ -41,7 +41,7 @@ class BasicTests { @Test fun gamePngExists() { Assert.assertTrue("This test will only pass when the game.png exists", - Gdx.files.local("game.png").exists()) + Gdx.files.local("").list().any { it.name().endsWith(".png") }) } @Test