fix some tests

alyssaruth · Feb 20, 2024 · ecdf31c · ecdf31c
1 parent 786cfe3
commit ecdf31c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/src/main/kotlin/dartzee/achievements/x01/AchievementX01BestGame.kt b/src/main/kotlin/dartzee/achievements/x01/AchievementX01BestGame.kt
@@ -2,15 +2,17 @@ package dartzee.achievements.x01
 
 import dartzee.achievements.AbstractAchievementBestGame
 import dartzee.achievements.AchievementType
+import dartzee.game.FinishType
 import dartzee.game.GameType
+import dartzee.game.X01Config
 import dartzee.utils.ResourceCache
 
 class AchievementX01BestGame : AbstractAchievementBestGame() {
     override val achievementType = AchievementType.X01_BEST_GAME
     override val name = "Leg-up"
     override val desc = "Best game of 501"
     override val gameType = GameType.X01
-    override val gameParams = "501"
+    override val gameParams = X01Config(501, FinishType.Doubles).toJson()
 
     override val redThreshold = 99
     override val orangeThreshold = 60

diff --git a/src/main/kotlin/dartzee/stats/GameWrapper.kt b/src/main/kotlin/dartzee/stats/GameWrapper.kt
@@ -6,6 +6,7 @@ import dartzee.db.GameEntity
 import dartzee.db.ParticipantEntity
 import dartzee.db.PlayerEntity
 import dartzee.game.GameType
+import dartzee.game.X01Config
 import dartzee.`object`.Dart
 import dartzee.screen.stats.player.HoleBreakdownWrapper
 import dartzee.screen.stats.player.golf.OptimalHoleStat
@@ -47,7 +48,7 @@ class GameWrapper(
     // For unfinished games, return -1 so they're sorted to the back
     fun getCheckoutTotal() = if (finalScore == -1) -1 else getScoreForFinalRound()
 
-    fun getGameStartValueX01() = gameParams.toInt()
+    fun getGameStartValueX01() = X01Config.fromJson(gameParams).target
 
     private fun getAllDartsFlattened() = hmRoundNumberToDarts.getAllValues()
 

diff --git a/src/test/kotlin/dartzee/game/TestGameType.kt b/src/test/kotlin/dartzee/game/TestGameType.kt
@@ -16,7 +16,8 @@ class TestGameType : AbstractTest() {
 
     @Test
     fun `Sensible descriptions with params`() {
-        GameType.X01.getDescription("701") shouldBe "701"
+        val x01Config = X01Config(701, FinishType.Any)
+        GameType.X01.getDescription(x01Config.toJson()) shouldBe x01Config.description()
         GameType.GOLF.getDescription("18") shouldBe "Golf - 18 holes"
         GameType.ROUND_THE_CLOCK.getDescription(
             RoundTheClockConfig(ClockType.Trebles, true).toJson()

diff --git a/src/test/kotlin/dartzee/screen/game/TestDartsMatchScreen.kt b/src/test/kotlin/dartzee/screen/game/TestDartsMatchScreen.kt
@@ -61,7 +61,7 @@ class TestDartsMatchScreen : AbstractTest() {
 
     @Test
     fun `Should update title based on selected tab`() {
-        val match = insertDartsMatch(gameParams = "501")
+        val match = insertDartsMatch(gameParams = DEFAULT_X01_CONFIG.toJson())
         val scrn = setUpMatchScreen(match)
 
         val g1 = insertGame()
@@ -124,7 +124,7 @@ class TestDartsMatchScreen : AbstractTest() {
 
     @Test
     fun `Should mark the match as complete if no more games need to be played`() {
-        val match = insertDartsMatch(games = 1, gameParams = "501")
+        val match = insertDartsMatch(games = 1, gameParams = DEFAULT_X01_CONFIG.toJson())
         val scrn = setUpMatchScreen(match = match)
 
         val firstGame = insertGame()
@@ -145,7 +145,7 @@ class TestDartsMatchScreen : AbstractTest() {
         val p2 = insertPlayer(name = "Billie")
         val gameOneStates = listOf(p1, p2).map { makeX01PlayerState(player = it) }
 
-        val match = insertDartsMatch(gameParams = "501")
+        val match = insertDartsMatch(gameParams = DEFAULT_X01_CONFIG.toJson())
 
         val scrn = setUpMatchScreen(match = match)
         val firstGame = insertGame(dartsMatchId = match.rowId, matchOrdinal = 1)
@@ -174,7 +174,7 @@ class TestDartsMatchScreen : AbstractTest() {
         val p2 = insertPlayer(name = "Billie")
         val gameOneStates = listOf(p1, p2).map { makeX01PlayerState(player = it) }
 
-        val match = insertDartsMatch(gameParams = "501")
+        val match = insertDartsMatch(gameParams = DEFAULT_X01_CONFIG.toJson())
 
         val scrn = setUpMatchScreen(match = match)
         val firstGame = insertGame(dartsMatchId = match.rowId, matchOrdinal = 1)

diff --git a/src/test/kotlin/dartzee/screen/game/TestGamePanelX01.kt b/src/test/kotlin/dartzee/screen/game/TestGamePanelX01.kt
@@ -6,12 +6,7 @@ import dartzee.db.EntityName
 import dartzee.db.X01FinishEntity
 import dartzee.game.FinishType
 import dartzee.game.X01Config
-import dartzee.helper.AbstractTest
-import dartzee.helper.AchievementSummary
-import dartzee.helper.preparePlayers
-import dartzee.helper.randomGuid
-import dartzee.helper.retrieveAchievementsForPlayer
-import dartzee.helper.wipeTable
+import dartzee.helper.*
 import dartzee.`object`.Dart
 import io.kotest.matchers.collections.shouldBeEmpty
 import io.kotest.matchers.collections.shouldContain
@@ -163,7 +158,7 @@ class TestGamePanelX01 : AbstractTest() {
     fun `Should correctly update such bad luck achievement for a team`() {
         val (p1, p2) = preparePlayers(2)
         val team = makeTeam(p1, p2)
-        val panel = makeX01GamePanel(team, gameParams = "101")
+        val panel = makeX01GamePanel(team, gameParams = X01Config(101, FinishType.Doubles).toJson())
         val gameId = panel.gameEntity.rowId
 
         panel.addCompletedRound(
@@ -205,7 +200,8 @@ class TestGamePanelX01 : AbstractTest() {
     @Test
     fun `Should not update hotel inspector achievement if board is missed, or player is bust`() {
         val playerId = randomGuid()
-        val panel = makeX01GamePanel(playerId, gameParams = "101")
+        val panel =
+            makeX01GamePanel(playerId, gameParams = X01Config(101, FinishType.Doubles).toJson())
 
         panel.addCompletedRound(listOf(Dart(20, 1), Dart(3, 2), Dart(19, 0)))
         panel.addCompletedRound(listOf(Dart(20, 1), Dart(20, 1), Dart(20, 1)))
@@ -242,7 +238,8 @@ class TestGamePanelX01 : AbstractTest() {
     @Test
     fun `Should not update chucklevision achievement if board is missed, or player is bust`() {
         val playerId = randomGuid()
-        val panel = makeX01GamePanel(playerId, gameParams = "101")
+        val panel =
+            makeX01GamePanel(playerId, gameParams = X01Config(101, FinishType.Doubles).toJson())
 
         panel.addCompletedRound(listOf(Dart(20, 3), Dart(3, 3), Dart(19, 0)))
         panel.addCompletedRound(listOf(Dart(5, 1), Dart(4, 1), Dart(20, 3)))
@@ -264,7 +261,8 @@ class TestGamePanelX01 : AbstractTest() {
 
     private fun verifyStylishFinish(finalRound: List<Dart>) {
         val playerId = randomGuid()
-        val panel = makeX01GamePanel(playerId, gameParams = "101")
+        val panel =
+            makeX01GamePanel(playerId, gameParams = X01Config(101, FinishType.Doubles).toJson())
 
         panel.addCompletedRound(listOf(Dart(20, 3), Dart(1, 1), Dart(20, 1)))
         panel.addCompletedRound(finalRound)

diff --git a/src/test/kotlin/dartzee/screen/reporting/TestReportingGameTab.kt b/src/test/kotlin/dartzee/screen/reporting/TestReportingGameTab.kt
@@ -183,7 +183,8 @@ class TestReportingGameTab : AbstractTest() {
         tab.generateReportParameters().gameParams shouldBe ""
 
         tab.clickChild<JCheckBox>(text = "Type")
-        tab.generateReportParameters().gameParams shouldBe X01Config(501, FinishType.Doubles).toJson()
+        tab.generateReportParameters().gameParams shouldBe
+            X01Config(501, FinishType.Doubles).toJson()
 
         tab.getChild<SpinnerX01>().value = 701
         tab.clickChild<JCheckBox>(text = "Finish on double")