Fixed tests

core/src/com/unciv/logic/map/TileInfo.kt

@@ -92,7 +92,6 @@ open class TileInfo {
         for (airUnit in airUnits) toReturn.airUnits.add(airUnit.clone())
         toReturn.position = position.cpy()
         toReturn.baseTerrain = baseTerrain
-//        toReturn.terrainFeature = terrainFeature
         convertTerrainFeatureToArray()
         toReturn.terrainFeatures.addAll(terrainFeatures)
         toReturn.naturalWonder = naturalWonder

tests/src/com/unciv/logic/map/TileImprovementConstructionTests.kt

@@ -32,11 +32,18 @@ class TileImprovementConstructionTests {
         tile.owningCity = city
         tile.position = Vector2(1f, 1f) // so that it's not on the same position as the city
         city.civInfo = civInfo
+
+
+        // Needed for convertHillToTerrainFeature to not crash
+        val tileMap = TileMap()
+        tileMap.tileMatrix.add(ArrayList<TileInfo?>().apply { add(tile) })
+        tile.tileMap = tileMap
     }
 
 
     @Test
     fun allTerrainSpecificImprovementsCanBeBuilt() {
+
         for (improvement in ruleSet.tileImprovements.values) {
             val terrain = improvement.terrainsCanBeBuiltOn.firstOrNull() ?: continue
             tile.baseTerrain = terrain

tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt

@@ -30,6 +30,7 @@ class UnitMovementAlgorithmsTests {
         RulesetCache.loadRulesets()
         ruleSet = RulesetCache.getBaseRuleset()
         tile.ruleset = ruleSet
+        tile.baseTerrain = Constants.grassland
         civInfo.tech.techsResearched.addAll(ruleSet.technologies.keys)
         civInfo.tech.embarkedUnitsCanEnterOcean = true
         civInfo.tech.unitsCanEmbark = true
@@ -38,6 +39,13 @@ class UnitMovementAlgorithmsTests {
             cities = arrayListOf("The Capital")
         }
         unit.civInfo = civInfo
+
+
+        // Needed for convertHillToTerrainFeature to not crash
+        val tileMap = TileMap()
+        tileMap.tileMatrix.add(ArrayList<TileInfo?>().apply { add(tile) })
+        tile.tileMap = tileMap
+        tile.setTransients()
     }
 
     @Test
@@ -55,27 +63,32 @@ class UnitMovementAlgorithmsTests {
 
     @Test
     fun unitCanEnterTheCity() {
+
         val map = TileMap()
-        tile.baseTerrain = Constants.hill
+        val cityTile = tile.clone() // reset, so that the isCoastalTile won't be carried over from previous tests
-        tile.tileMap = map
+        cityTile.baseTerrain = Constants.grassland
-        tile.setTransients()
+        cityTile.tileMap = map
+        cityTile.ruleset = ruleSet
+        cityTile.setTransients()
+        map.tileMatrix.add(arrayListOf(cityTile)) // needed for tile.setTransients()
 
         val otherTile = tile.clone()
         otherTile.baseTerrain = Constants.coast
         otherTile.position.y = 1f
-
+        map.tileMatrix[0].add(otherTile)
-        map.tileMatrix.add(arrayListOf(tile, otherTile))
 
         val city = CityInfo()
-        city.location = tile.position
+        city.location = cityTile.position
         city.civInfo = civInfo
-        tile.owningCity = city
+        cityTile.owningCity = city
 
         for (type in UnitType.values())
         {
             unit.owner = civInfo.civName
             unit.baseUnit = BaseUnit().apply { unitType = type }
-            Assert.assertTrue(type.name, unit.movement.canPassThrough(tile))
+            if(!unit.movement.canPassThrough(cityTile))
+                unit.movement.canPassThrough(cityTile)
+            Assert.assertTrue(type.name, unit.movement.canPassThrough(cityTile))
         }
     }