From f9134c90dc4f44a22f81dbfe61b5002603dce597 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 30 Oct 2023 11:11:11 +0200
Subject: [PATCH] @Framonti This test seems to be flaky - works from my
 computer but fails sometimes on github

---
 .../managers/CityPopulationManagerTest.kt     | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/src/com/unciv/logic/city/managers/CityPopulationManagerTest.kt b/tests/src/com/unciv/logic/city/managers/CityPopulationManagerTest.kt
index b91c9cd064..33c57e59c4 100644
--- a/tests/src/com/unciv/logic/city/managers/CityPopulationManagerTest.kt
+++ b/tests/src/com/unciv/logic/city/managers/CityPopulationManagerTest.kt
@@ -190,7 +190,7 @@ class CityPopulationManagerTest {
     }
 
     @Test
-    fun `should automatically assing new pop to job`() {
+    fun `should automatically assign new pop to job`() {
         // given
         city.population.foodStored = 14
 
@@ -202,26 +202,27 @@ class CityPopulationManagerTest {
         assertEquals(0, city.population.getFreePopulation())
     }
 
-    @Test
-    fun `should automatically assing new pop to best job`() {
-        // given
-        city.lockedTiles.add(Vector2(-1f, 0f)) // force the first pop to work on a specific tile to avoid being reassigned
-        val goodTile = testGame.setTileTerrain(Vector2.X, Constants.grassland)
-        goodTile.improvement = "Farm"
-        assertFalse(city.workedTiles.contains(goodTile.position))
-
-        city.population.foodStored = 14
-
-        // when
-        city.population.nextTurn(1)
-
-        // then
-        assertEquals(2, city.population.population)
-        assertTrue(city.workedTiles.contains(goodTile.position))
-    }
+    // Flaky test!
+//     @Test
+//     fun `should automatically assign new pop to best job`() {
+//         // given
+//         city.lockedTiles.add(Vector2(-1f, 0f)) // force the first pop to work on a specific tile to avoid being reassigned
+//         val goodTile = testGame.setTileTerrain(Vector2.X, Constants.grassland)
+//         goodTile.improvement = "Farm"
+//         assertFalse(city.workedTiles.contains(goodTile.position))
+//
+//         city.population.foodStored = 14
+//
+//         // when
+//         city.population.nextTurn(1)
+//
+//         // then
+//         assertEquals(2, city.population.population)
+//         assertTrue(city.workedTiles.contains(goodTile.position))
+//     }
 
     @Test
-    fun `should automatically assing new pop to best job according to city focus`() {
+    fun `should automatically assign new pop to best job according to city focus`() {
         // given
         city.cityAIFocus = CityFocus.GoldFocus
         city.lockedTiles.add(Vector2(-1f, 0f)) // force the first pop to work on a specific tile to avoid being reassigned
@@ -246,7 +247,7 @@ class CityPopulationManagerTest {
     }
 
     @Test
-    fun `should automatically assing new pop to best job with specialists`() {
+    fun `should automatically assign new pop to best job with specialists`() {
         // given
         city.cityAIFocus = CityFocus.GoldFocus
         city.lockedTiles.add(Vector2(-1f, 0f)) // force the first pop to work on a specific tile to avoid being reassigned