diff options
Diffstat (limited to 'game-engine/src/test/kotlin')
4 files changed, 3 insertions, 18 deletions
diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt index e1d8b7f9..9db75e56 100644 --- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt +++ b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt @@ -10,7 +10,6 @@ import org.luxons.sevenwonders.game.api.HandCard import org.luxons.sevenwonders.game.api.PlayerMove import org.luxons.sevenwonders.game.api.PlayerTurnInfo import org.luxons.sevenwonders.game.api.Table -import org.luxons.sevenwonders.game.data.GameDefinitionLoader import org.luxons.sevenwonders.game.data.LAST_AGE import org.luxons.sevenwonders.game.moves.MoveType import org.luxons.sevenwonders.game.resources.ResourceTransactions @@ -41,7 +40,7 @@ class GameTest { private fun createGame(nbPlayers: Int): Game { val settings = testCustomizableSettings() - return GameDefinitionLoader.gameDefinition.initGame(0, settings, nbPlayers) + return GameDefinition.load().initGame(0, settings, nbPlayers) } private fun playTurn(nbPlayers: Int, game: Game, ageToCheck: Int, handSize: Int) { diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.kt b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.kt deleted file mode 100644 index c312c12f..00000000 --- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.luxons.sevenwonders.game.data - -import org.junit.Assert.assertNotNull -import org.junit.Test - -class GameDefinitionLoaderTest { - - @Test - fun successfulLoad() { - val gameDefinition = GameDefinitionLoader.gameDefinition - assertNotNull(gameDefinition) - } -} diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt index 162af7a3..0359938a 100644 --- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt +++ b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt @@ -9,7 +9,7 @@ class GameDefinitionTest { @Test fun successfulGameInit() { - val gameDefinition = GameDefinitionLoader.gameDefinition + val gameDefinition = GameDefinition.load() assertNotNull(gameDefinition) assertEquals(3, gameDefinition.minPlayers.toLong()) assertEquals(7, gameDefinition.maxPlayers.toLong()) diff --git a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt index 5b84d466..2d992ba6 100644 --- a/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt +++ b/game-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.kt @@ -7,8 +7,7 @@ import org.junit.experimental.theories.DataPoints import org.junit.experimental.theories.Theories import org.junit.experimental.theories.Theory import org.junit.runner.RunWith -import org.luxons.sevenwonders.game.data.WonderSide -import org.luxons.sevenwonders.game.data.WonderSidePickMethod +import org.luxons.sevenwonders.game.api.WonderSidePickMethod import java.util.Random @RunWith(Theories::class) |