summaryrefslogtreecommitdiff
path: root/sw-engine/src/test/kotlin/org/luxons
diff options
context:
space:
mode:
authorJoffrey BION <joffrey.bion@gmail.com>2019-05-22 02:40:48 +0200
committerJoffrey BION <joffrey.bion@gmail.com>2019-05-22 02:40:48 +0200
commit157edc9b8027f63998758d3c91cbaa1053550f0f (patch)
tree3c5b1b6b4c3c33f1493d6ef2a5ec71a796b24603 /sw-engine/src/test/kotlin/org/luxons
parentReorder subprojects in settings.gradle to make more sense (diff)
downloadseven-wonders-157edc9b8027f63998758d3c91cbaa1053550f0f.tar.gz
seven-wonders-157edc9b8027f63998758d3c91cbaa1053550f0f.tar.bz2
seven-wonders-157edc9b8027f63998758d3c91cbaa1053550f0f.zip
Reorganize packages again
Diffstat (limited to 'sw-engine/src/test/kotlin/org/luxons')
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt)38
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/BoardTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt)34
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/MilitaryTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/RelativeBoardPositionTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/ScienceTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardBackTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt)24
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/DecksTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt)6
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandRotationDirectionTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt)10
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt)22
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/GameDefinitionTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/NumericEffectSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt)12
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt)12
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt)10
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourceTypeSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourceTypesSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt)4
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourcesSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt)16
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ScienceProgressSerializerTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt)8
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt)18
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt)10
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt)10
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt)10
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt)14
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/RawPointsIncreaseTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt)6
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt)12
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt)14
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt)22
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt)32
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ProductionTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt)18
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourceTransactionsTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt)12
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourcesTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt)18
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/TradingRulesTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt)12
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/test/TestUtils.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt)65
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/wonders/WonderTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt)6
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/model/BoardsKtTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt)12
-rw-r--r--sw-engine/src/test/kotlin/org/luxons/sevenwonders/model/TableTest.kt (renamed from sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt)8
37 files changed, 265 insertions, 258 deletions
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt
index a3b5cf62..935d66e5 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/GameTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt
@@ -1,17 +1,17 @@
-package org.luxons.sevenwonders.game
-
-import org.luxons.sevenwonders.game.api.Action
-import org.luxons.sevenwonders.game.api.PlayedMove
-import org.luxons.sevenwonders.game.api.PlayerMove
-import org.luxons.sevenwonders.game.api.PlayerTurnInfo
-import org.luxons.sevenwonders.game.api.cards.HandCard
-import org.luxons.sevenwonders.game.api.cards.TableCard
-import org.luxons.sevenwonders.game.data.GameDefinition
-import org.luxons.sevenwonders.game.data.LAST_AGE
-import org.luxons.sevenwonders.game.api.MoveType
-import org.luxons.sevenwonders.game.api.resources.ResourceTransactions
-import org.luxons.sevenwonders.game.api.resources.noTransactions
-import org.luxons.sevenwonders.game.test.testCustomizableSettings
+package org.luxons.sevenwonders.engine
+
+import org.luxons.sevenwonders.model.Action
+import org.luxons.sevenwonders.model.PlayedMove
+import org.luxons.sevenwonders.model.PlayerMove
+import org.luxons.sevenwonders.model.PlayerTurnInfo
+import org.luxons.sevenwonders.model.cards.HandCard
+import org.luxons.sevenwonders.model.cards.TableCard
+import org.luxons.sevenwonders.engine.data.GameDefinition
+import org.luxons.sevenwonders.engine.data.LAST_AGE
+import org.luxons.sevenwonders.model.MoveType
+import org.luxons.sevenwonders.model.resources.ResourceTransactions
+import org.luxons.sevenwonders.model.resources.noTransactions
+import org.luxons.sevenwonders.engine.test.testCustomizableSettings
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
@@ -93,8 +93,14 @@ class GameTest {
assertFalse(neighbourGuilds.isEmpty())
return MoveExpectation(
turnInfo.playerIndex,
- PlayerMove(MoveType.COPY_GUILD, neighbourGuilds.first().name),
- PlayedMove(turnInfo.playerIndex, MoveType.COPY_GUILD, neighbourGuilds.first(),
+ PlayerMove(
+ MoveType.COPY_GUILD,
+ neighbourGuilds.first().name
+ ),
+ PlayedMove(
+ turnInfo.playerIndex,
+ MoveType.COPY_GUILD,
+ neighbourGuilds.first(),
noTransactions()
)
)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/BoardTest.kt
index 669934aa..0b514e5f 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/BoardTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/BoardTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.boards
+package org.luxons.sevenwonders.engine.boards
import junit.framework.TestCase.assertEquals
import org.junit.Assume.assumeTrue
@@ -8,22 +8,22 @@ import org.junit.experimental.theories.FromDataPoints
import org.junit.experimental.theories.Theories
import org.junit.experimental.theories.Theory
import org.junit.runner.RunWith
-import org.luxons.sevenwonders.game.boards.Board.InsufficientFundsException
-import org.luxons.sevenwonders.game.api.cards.Color
-import org.luxons.sevenwonders.game.effects.RawPointsIncrease
-import org.luxons.sevenwonders.game.effects.SpecialAbility
-import org.luxons.sevenwonders.game.effects.SpecialAbilityActivation
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.resources.resourcesOf
-import org.luxons.sevenwonders.game.score.ScoreCategory
-import org.luxons.sevenwonders.game.test.addCards
-import org.luxons.sevenwonders.game.test.getDifferentColorFrom
-import org.luxons.sevenwonders.game.test.playCardWithEffect
-import org.luxons.sevenwonders.game.test.singleBoardPlayer
-import org.luxons.sevenwonders.game.test.testBoard
-import org.luxons.sevenwonders.game.test.testCard
-import org.luxons.sevenwonders.game.test.testSettings
-import org.luxons.sevenwonders.game.test.testWonder
+import org.luxons.sevenwonders.engine.boards.Board.InsufficientFundsException
+import org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.engine.effects.RawPointsIncrease
+import org.luxons.sevenwonders.engine.effects.SpecialAbility
+import org.luxons.sevenwonders.engine.effects.SpecialAbilityActivation
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.resources.resourcesOf
+import org.luxons.sevenwonders.engine.score.ScoreCategory
+import org.luxons.sevenwonders.engine.test.addCards
+import org.luxons.sevenwonders.engine.test.getDifferentColorFrom
+import org.luxons.sevenwonders.engine.test.playCardWithEffect
+import org.luxons.sevenwonders.engine.test.singleBoardPlayer
+import org.luxons.sevenwonders.engine.test.testBoard
+import org.luxons.sevenwonders.engine.test.testCard
+import org.luxons.sevenwonders.engine.test.testSettings
+import org.luxons.sevenwonders.engine.test.testWonder
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
import kotlin.test.assertSame
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/MilitaryTest.kt
index 248d43dd..509d8670 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/MilitaryTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/MilitaryTest.kt
@@ -1,11 +1,11 @@
-package org.luxons.sevenwonders.game.boards
+package org.luxons.sevenwonders.engine.boards
import org.junit.experimental.theories.DataPoints
import org.junit.experimental.theories.FromDataPoints
import org.junit.experimental.theories.Theories
import org.junit.experimental.theories.Theory
import org.junit.runner.RunWith
-import org.luxons.sevenwonders.game.boards.Military.UnknownAgeException
+import org.luxons.sevenwonders.engine.boards.Military.UnknownAgeException
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/RelativeBoardPositionTest.kt
index 75743b86..2c6aa9ad 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/RelativeBoardPositionTest.kt
@@ -1,11 +1,11 @@
-package org.luxons.sevenwonders.game.boards
+package org.luxons.sevenwonders.engine.boards
import org.junit.Assume.assumeTrue
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.api.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.model.boards.RelativeBoardPosition
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/ScienceTest.kt
index 80d6773d..e3f6f47d 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/boards/ScienceTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/ScienceTest.kt
@@ -1,11 +1,11 @@
-package org.luxons.sevenwonders.game.boards
+package org.luxons.sevenwonders.engine.boards
import org.junit.Test
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.test.createScience
+import org.luxons.sevenwonders.engine.test.createScience
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardBackTest.kt
index 967735b8..44bdc10d 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardBackTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardBackTest.kt
@@ -1,7 +1,7 @@
-package org.luxons.sevenwonders.game.cards
+package org.luxons.sevenwonders.engine.cards
import org.junit.Test
-import org.luxons.sevenwonders.game.api.cards.CardBack
+import org.luxons.sevenwonders.model.cards.CardBack
import kotlin.test.assertEquals
class CardBackTest {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardTest.kt
index 56fc9725..8fd673b2 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/CardTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardTest.kt
@@ -1,17 +1,17 @@
-package org.luxons.sevenwonders.game.cards
+package org.luxons.sevenwonders.engine.cards
import org.junit.Test
-import org.luxons.sevenwonders.game.SimplePlayer
-import org.luxons.sevenwonders.game.api.cards.Color
-import org.luxons.sevenwonders.game.boards.Board
-import org.luxons.sevenwonders.game.boards.Table
-import org.luxons.sevenwonders.game.effects.ProductionIncrease
-import org.luxons.sevenwonders.game.resources.Production
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.api.resources.noTransactions
-import org.luxons.sevenwonders.game.test.testCard
-import org.luxons.sevenwonders.game.test.testSettings
-import org.luxons.sevenwonders.game.wonders.Wonder
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.engine.boards.Board
+import org.luxons.sevenwonders.engine.boards.Table
+import org.luxons.sevenwonders.engine.effects.ProductionIncrease
+import org.luxons.sevenwonders.engine.resources.Production
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.noTransactions
+import org.luxons.sevenwonders.engine.test.testCard
+import org.luxons.sevenwonders.engine.test.testSettings
+import org.luxons.sevenwonders.engine.wonders.Wonder
import kotlin.test.assertEquals
class CardTest {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/DecksTest.kt
index f6c45720..bd2615cd 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/DecksTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/DecksTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.cards
+package org.luxons.sevenwonders.engine.cards
import org.junit.Assume.assumeTrue
import org.junit.Test
@@ -6,8 +6,8 @@ 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.cards.Decks.CardNotFoundException
-import org.luxons.sevenwonders.game.test.sampleCards
+import org.luxons.sevenwonders.engine.cards.Decks.CardNotFoundException
+import org.luxons.sevenwonders.engine.test.sampleCards
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertNotNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandRotationDirectionTest.kt
index 2fbaf8ed..aa681c9c 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandRotationDirectionTest.kt
@@ -1,7 +1,7 @@
-package org.luxons.sevenwonders.game.cards
+package org.luxons.sevenwonders.engine.cards
import org.junit.Test
-import org.luxons.sevenwonders.game.api.cards.HandRotationDirection
+import org.luxons.sevenwonders.model.cards.HandRotationDirection
import kotlin.test.assertEquals
class HandRotationDirectionTest {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt
index 4c9f258c..b8491434 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/HandsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.cards
+package org.luxons.sevenwonders.engine.cards
import org.junit.Assume.assumeTrue
import org.junit.Test
@@ -7,10 +7,10 @@ import org.junit.experimental.theories.FromDataPoints
import org.junit.experimental.theories.Theories
import org.junit.experimental.theories.Theory
import org.junit.runner.RunWith
-import org.luxons.sevenwonders.game.SimplePlayer
-import org.luxons.sevenwonders.game.api.cards.HandRotationDirection
-import org.luxons.sevenwonders.game.test.sampleCards
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.cards.HandRotationDirection
+import org.luxons.sevenwonders.engine.test.sampleCards
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertFalse
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt
index 4bed43b3..da0ae124 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/cards/RequirementsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.cards
+package org.luxons.sevenwonders.engine.cards
import org.junit.Assume.assumeTrue
import org.junit.Test
@@ -6,16 +6,16 @@ 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.SimplePlayer
-import org.luxons.sevenwonders.game.boards.Table
-import org.luxons.sevenwonders.game.api.resources.Provider
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.resources.emptyResources
-import org.luxons.sevenwonders.game.api.resources.noTransactions
-import org.luxons.sevenwonders.game.test.createRequirements
-import org.luxons.sevenwonders.game.test.createTransactions
-import org.luxons.sevenwonders.game.test.singleBoardPlayer
-import org.luxons.sevenwonders.game.test.testBoard
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.engine.boards.Table
+import org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.resources.emptyResources
+import org.luxons.sevenwonders.model.resources.noTransactions
+import org.luxons.sevenwonders.engine.test.createRequirements
+import org.luxons.sevenwonders.engine.test.createTransactions
+import org.luxons.sevenwonders.engine.test.singleBoardPlayer
+import org.luxons.sevenwonders.engine.test.testBoard
import kotlin.test.assertEquals
import kotlin.test.assertSame
import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/GameDefinitionTest.kt
index 4317a933..b9b7bb3c 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/GameDefinitionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/GameDefinitionTest.kt
@@ -1,7 +1,7 @@
-package org.luxons.sevenwonders.game.data
+package org.luxons.sevenwonders.engine.data
import org.junit.Test
-import org.luxons.sevenwonders.game.api.CustomizableSettings
+import org.luxons.sevenwonders.model.CustomizableSettings
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/NumericEffectSerializerTest.kt
index 9b44fad2..6a399977 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/NumericEffectSerializerTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.google.gson.Gson
@@ -9,11 +9,11 @@ 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.effects.GoldIncrease
-import org.luxons.sevenwonders.game.effects.MilitaryReinforcements
-import org.luxons.sevenwonders.game.effects.ProductionIncrease
-import org.luxons.sevenwonders.game.effects.RawPointsIncrease
-import org.luxons.sevenwonders.game.resources.Production
+import org.luxons.sevenwonders.engine.effects.GoldIncrease
+import org.luxons.sevenwonders.engine.effects.MilitaryReinforcements
+import org.luxons.sevenwonders.engine.effects.ProductionIncrease
+import org.luxons.sevenwonders.engine.effects.RawPointsIncrease
+import org.luxons.sevenwonders.engine.resources.Production
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt
index 5ea60d5d..709f2a87 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.google.gson.Gson
@@ -6,11 +6,11 @@ import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.effects.ProductionIncrease
-import org.luxons.sevenwonders.game.resources.MutableResources
-import org.luxons.sevenwonders.game.resources.Production
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.resources.Resources
+import org.luxons.sevenwonders.engine.effects.ProductionIncrease
+import org.luxons.sevenwonders.engine.resources.MutableResources
+import org.luxons.sevenwonders.engine.resources.Production
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.resources.Resources
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionSerializerTest.kt
index 4fbd8373..4af1d900 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ProductionSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionSerializerTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.google.gson.Gson
@@ -6,10 +6,10 @@ import com.google.gson.GsonBuilder
import com.google.gson.reflect.TypeToken
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.resources.MutableResources
-import org.luxons.sevenwonders.game.resources.Production
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.resources.Resources
+import org.luxons.sevenwonders.engine.resources.MutableResources
+import org.luxons.sevenwonders.engine.resources.Production
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.resources.Resources
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourceTypeSerializerTest.kt
index c5e7b53d..e256efc3 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourceTypeSerializerTest.kt
@@ -1,11 +1,11 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.api.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.ResourceType
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourceTypesSerializerTest.kt
index 242f2e51..8c2ce2fc 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourceTypesSerializerTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.github.salomonbrys.kotson.typeToken
@@ -7,7 +7,7 @@ import com.google.gson.Gson
import com.google.gson.GsonBuilder
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.api.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.ResourceType
import kotlin.test.assertEquals
import kotlin.test.assertNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourcesSerializerTest.kt
index 58745841..c8074f2d 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourcesSerializerTest.kt
@@ -1,17 +1,17 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.resources.MutableResources
-import org.luxons.sevenwonders.game.api.resources.ResourceType.CLAY
-import org.luxons.sevenwonders.game.api.resources.ResourceType.STONE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.WOOD
-import org.luxons.sevenwonders.game.resources.Resources
-import org.luxons.sevenwonders.game.resources.emptyResources
-import org.luxons.sevenwonders.game.resources.resourcesOf
+import org.luxons.sevenwonders.engine.resources.MutableResources
+import org.luxons.sevenwonders.model.resources.ResourceType.CLAY
+import org.luxons.sevenwonders.model.resources.ResourceType.STONE
+import org.luxons.sevenwonders.model.resources.ResourceType.WOOD
+import org.luxons.sevenwonders.engine.resources.Resources
+import org.luxons.sevenwonders.engine.resources.emptyResources
+import org.luxons.sevenwonders.engine.resources.resourcesOf
import kotlin.test.assertEquals
import kotlin.test.assertNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ScienceProgressSerializerTest.kt
index 95d72517..19b1e572 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ScienceProgressSerializerTest.kt
@@ -1,13 +1,13 @@
-package org.luxons.sevenwonders.game.data.serializers
+package org.luxons.sevenwonders.engine.data.serializers
import com.github.salomonbrys.kotson.fromJson
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.boards.ScienceType
-import org.luxons.sevenwonders.game.effects.ScienceProgress
-import org.luxons.sevenwonders.game.test.createScienceProgress
+import org.luxons.sevenwonders.engine.boards.ScienceType
+import org.luxons.sevenwonders.engine.effects.ScienceProgress
+import org.luxons.sevenwonders.engine.test.createScienceProgress
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertNotNull
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt
index 3c72d0aa..ce914aab 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt
@@ -1,18 +1,18 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
import org.junit.Before
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.Player
-import org.luxons.sevenwonders.game.SimplePlayer
-import org.luxons.sevenwonders.game.api.boards.RelativeBoardPosition
-import org.luxons.sevenwonders.game.boards.Table
-import org.luxons.sevenwonders.game.api.cards.CardBack
-import org.luxons.sevenwonders.game.api.cards.Color
-import org.luxons.sevenwonders.game.test.addCards
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.Player
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.engine.boards.Table
+import org.luxons.sevenwonders.model.cards.CardBack
+import org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.engine.test.addCards
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt
index 9773ec5c..d989d24a 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/DiscountTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt
@@ -1,14 +1,14 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
import org.junit.Assume
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.api.resources.Provider
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.test.createTransactions
-import org.luxons.sevenwonders.game.test.testBoard
+import org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.test.createTransactions
+import org.luxons.sevenwonders.engine.test.testBoard
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt
index 3ade2773..67bb3862 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt
@@ -1,13 +1,13 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
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.SimplePlayer
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.test.testBoard
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.test.testBoard
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt
index c8a89aaf..23b5959e 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt
@@ -1,13 +1,13 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
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.SimplePlayer
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.test.testBoard
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.test.testBoard
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt
index 15366fd0..235b2fa7 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt
@@ -1,15 +1,15 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
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.SimplePlayer
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.resources.resourcesOf
-import org.luxons.sevenwonders.game.test.fixedProduction
-import org.luxons.sevenwonders.game.test.testBoard
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.resources.resourcesOf
+import org.luxons.sevenwonders.engine.test.fixedProduction
+import org.luxons.sevenwonders.engine.test.testBoard
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/RawPointsIncreaseTest.kt
index 9cb10562..eb48f4ed 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/RawPointsIncreaseTest.kt
@@ -1,11 +1,11 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
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.SimplePlayer
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt
index b782f6b3..b7f5e152 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/ScienceProgressTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt
@@ -1,14 +1,14 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
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.boards.ScienceType
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.test.createScience
-import org.luxons.sevenwonders.game.test.createScienceProgress
-import org.luxons.sevenwonders.game.test.testBoard
+import org.luxons.sevenwonders.engine.boards.ScienceType
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.engine.test.createScience
+import org.luxons.sevenwonders.engine.test.createScienceProgress
+import org.luxons.sevenwonders.engine.test.testBoard
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt
index f273783c..16fbeae6 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt
@@ -1,4 +1,4 @@
-package org.luxons.sevenwonders.game.effects
+package org.luxons.sevenwonders.engine.effects
import org.junit.Assume
import org.junit.Test
@@ -6,12 +6,12 @@ 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.SimplePlayer
-import org.luxons.sevenwonders.game.api.boards.RelativeBoardPosition
-import org.luxons.sevenwonders.game.cards.Card
-import org.luxons.sevenwonders.game.api.cards.Color
-import org.luxons.sevenwonders.game.test.createGuildCard
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.model.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.engine.cards.Card
+import org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.engine.test.createGuildCard
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt
index 5d4f0236..764d7890 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/moves/BuildWonderMoveTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt
@@ -1,16 +1,16 @@
-package org.luxons.sevenwonders.game.moves
+package org.luxons.sevenwonders.engine.moves
import org.junit.Test
-import org.luxons.sevenwonders.game.PlayerContext
-import org.luxons.sevenwonders.game.Settings
-import org.luxons.sevenwonders.game.api.MoveType
-import org.luxons.sevenwonders.game.boards.Table
-import org.luxons.sevenwonders.game.cards.Card
-import org.luxons.sevenwonders.game.test.createMove
-import org.luxons.sevenwonders.game.test.sampleCards
-import org.luxons.sevenwonders.game.test.testCard
-import org.luxons.sevenwonders.game.test.testSettings
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.PlayerContext
+import org.luxons.sevenwonders.engine.Settings
+import org.luxons.sevenwonders.model.MoveType
+import org.luxons.sevenwonders.engine.boards.Table
+import org.luxons.sevenwonders.engine.cards.Card
+import org.luxons.sevenwonders.engine.test.createMove
+import org.luxons.sevenwonders.engine.test.sampleCards
+import org.luxons.sevenwonders.engine.test.testCard
+import org.luxons.sevenwonders.engine.test.testSettings
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
import kotlin.test.fail
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt
index c531a866..a003a332 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/BestPriceCalculatorTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt
@@ -1,21 +1,21 @@
-package org.luxons.sevenwonders.game.resources
+package org.luxons.sevenwonders.engine.resources
import org.junit.Test
-import org.luxons.sevenwonders.game.SimplePlayer
-import org.luxons.sevenwonders.game.boards.Table
-import org.luxons.sevenwonders.game.api.resources.Provider.LEFT_PLAYER
-import org.luxons.sevenwonders.game.api.resources.Provider.RIGHT_PLAYER
-import org.luxons.sevenwonders.game.api.resources.ResourceTransactions
-import org.luxons.sevenwonders.game.api.resources.ResourceType.CLAY
-import org.luxons.sevenwonders.game.api.resources.ResourceType.GLASS
-import org.luxons.sevenwonders.game.api.resources.ResourceType.ORE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.STONE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.WOOD
-import org.luxons.sevenwonders.game.api.resources.noTransactions
-import org.luxons.sevenwonders.game.test.createTransaction
-import org.luxons.sevenwonders.game.test.createTransactions
-import org.luxons.sevenwonders.game.test.testBoard
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.engine.SimplePlayer
+import org.luxons.sevenwonders.engine.boards.Table
+import org.luxons.sevenwonders.model.resources.Provider.LEFT_PLAYER
+import org.luxons.sevenwonders.model.resources.Provider.RIGHT_PLAYER
+import org.luxons.sevenwonders.model.resources.ResourceTransactions
+import org.luxons.sevenwonders.model.resources.ResourceType.CLAY
+import org.luxons.sevenwonders.model.resources.ResourceType.GLASS
+import org.luxons.sevenwonders.model.resources.ResourceType.ORE
+import org.luxons.sevenwonders.model.resources.ResourceType.STONE
+import org.luxons.sevenwonders.model.resources.ResourceType.WOOD
+import org.luxons.sevenwonders.model.resources.noTransactions
+import org.luxons.sevenwonders.engine.test.createTransaction
+import org.luxons.sevenwonders.engine.test.createTransactions
+import org.luxons.sevenwonders.engine.test.testBoard
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
class BestPriceCalculatorTest {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ProductionTest.kt
index 13d7a10e..c449c784 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ProductionTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ProductionTest.kt
@@ -1,15 +1,15 @@
-package org.luxons.sevenwonders.game.resources
+package org.luxons.sevenwonders.engine.resources
import org.junit.Before
import org.junit.Test
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.api.resources.ResourceType.CLAY
-import org.luxons.sevenwonders.game.api.resources.ResourceType.GLASS
-import org.luxons.sevenwonders.game.api.resources.ResourceType.LOOM
-import org.luxons.sevenwonders.game.api.resources.ResourceType.ORE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.PAPYRUS
-import org.luxons.sevenwonders.game.api.resources.ResourceType.STONE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.WOOD
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.ResourceType.CLAY
+import org.luxons.sevenwonders.model.resources.ResourceType.GLASS
+import org.luxons.sevenwonders.model.resources.ResourceType.LOOM
+import org.luxons.sevenwonders.model.resources.ResourceType.ORE
+import org.luxons.sevenwonders.model.resources.ResourceType.PAPYRUS
+import org.luxons.sevenwonders.model.resources.ResourceType.STONE
+import org.luxons.sevenwonders.model.resources.ResourceType.WOOD
import java.util.EnumSet
import java.util.HashSet
import kotlin.test.assertEquals
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourceTransactionsTest.kt
index 6ae4169a..665612e3 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourceTransactionsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourceTransactionsTest.kt
@@ -1,11 +1,11 @@
-package org.luxons.sevenwonders.game.resources
+package org.luxons.sevenwonders.engine.resources
import org.junit.Test
-import org.luxons.sevenwonders.game.api.resources.Provider
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.api.resources.ResourceType.CLAY
-import org.luxons.sevenwonders.game.api.resources.ResourceType.WOOD
-import org.luxons.sevenwonders.game.test.createTransaction
+import org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.ResourceType.CLAY
+import org.luxons.sevenwonders.model.resources.ResourceType.WOOD
+import org.luxons.sevenwonders.engine.test.createTransaction
import kotlin.test.assertEquals
class ResourceTransactionsTest {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourcesTest.kt
index e53789b6..3aa5acd4 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/ResourcesTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourcesTest.kt
@@ -1,14 +1,14 @@
-package org.luxons.sevenwonders.game.resources
+package org.luxons.sevenwonders.engine.resources
import org.junit.Test
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.api.resources.ResourceType.CLAY
-import org.luxons.sevenwonders.game.api.resources.ResourceType.GLASS
-import org.luxons.sevenwonders.game.api.resources.ResourceType.LOOM
-import org.luxons.sevenwonders.game.api.resources.ResourceType.ORE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.PAPYRUS
-import org.luxons.sevenwonders.game.api.resources.ResourceType.STONE
-import org.luxons.sevenwonders.game.api.resources.ResourceType.WOOD
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.ResourceType.CLAY
+import org.luxons.sevenwonders.model.resources.ResourceType.GLASS
+import org.luxons.sevenwonders.model.resources.ResourceType.LOOM
+import org.luxons.sevenwonders.model.resources.ResourceType.ORE
+import org.luxons.sevenwonders.model.resources.ResourceType.PAPYRUS
+import org.luxons.sevenwonders.model.resources.ResourceType.STONE
+import org.luxons.sevenwonders.model.resources.ResourceType.WOOD
import java.util.NoSuchElementException
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/TradingRulesTest.kt
index 99f85ac2..0301b16c 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/resources/TradingRulesTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/TradingRulesTest.kt
@@ -1,15 +1,15 @@
-package org.luxons.sevenwonders.game.resources
+package org.luxons.sevenwonders.engine.resources
import org.junit.Assume.assumeTrue
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.api.resources.Provider
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.api.resources.noTransactions
-import org.luxons.sevenwonders.game.test.createTransaction
-import org.luxons.sevenwonders.game.test.createTransactions
+import org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.noTransactions
+import org.luxons.sevenwonders.engine.test.createTransaction
+import org.luxons.sevenwonders.engine.test.createTransactions
import kotlin.test.assertEquals
@RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/test/TestUtils.kt
index e666140e..7c1935ae 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/test/TestUtils.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/test/TestUtils.kt
@@ -1,34 +1,34 @@
-package org.luxons.sevenwonders.game.test
-
-import org.luxons.sevenwonders.game.Player
-import org.luxons.sevenwonders.game.PlayerContext
-import org.luxons.sevenwonders.game.Settings
-import org.luxons.sevenwonders.game.api.resources.CountedResource
-import org.luxons.sevenwonders.game.api.CustomizableSettings
-import org.luxons.sevenwonders.game.api.PlayerMove
-import org.luxons.sevenwonders.game.boards.Board
-import org.luxons.sevenwonders.game.api.boards.RelativeBoardPosition
-import org.luxons.sevenwonders.game.boards.Science
-import org.luxons.sevenwonders.game.boards.ScienceType
-import org.luxons.sevenwonders.game.boards.Table
-import org.luxons.sevenwonders.game.cards.Card
-import org.luxons.sevenwonders.game.api.cards.CardBack
-import org.luxons.sevenwonders.game.api.cards.Color
-import org.luxons.sevenwonders.game.cards.Requirements
-import org.luxons.sevenwonders.game.effects.Effect
-import org.luxons.sevenwonders.game.effects.ScienceProgress
-import org.luxons.sevenwonders.game.moves.Move
-import org.luxons.sevenwonders.game.api.MoveType
-import org.luxons.sevenwonders.game.moves.resolve
-import org.luxons.sevenwonders.game.resources.Production
-import org.luxons.sevenwonders.game.api.resources.Provider
-import org.luxons.sevenwonders.game.api.resources.ResourceTransaction
-import org.luxons.sevenwonders.game.api.resources.ResourceTransactions
-import org.luxons.sevenwonders.game.api.resources.ResourceType
-import org.luxons.sevenwonders.game.api.resources.noTransactions
-import org.luxons.sevenwonders.game.resources.resourcesOf
-import org.luxons.sevenwonders.game.wonders.Wonder
-import org.luxons.sevenwonders.game.wonders.WonderStage
+package org.luxons.sevenwonders.engine.test
+
+import org.luxons.sevenwonders.engine.Player
+import org.luxons.sevenwonders.engine.PlayerContext
+import org.luxons.sevenwonders.engine.Settings
+import org.luxons.sevenwonders.model.resources.CountedResource
+import org.luxons.sevenwonders.model.CustomizableSettings
+import org.luxons.sevenwonders.model.PlayerMove
+import org.luxons.sevenwonders.engine.boards.Board
+import org.luxons.sevenwonders.model.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.engine.boards.Science
+import org.luxons.sevenwonders.engine.boards.ScienceType
+import org.luxons.sevenwonders.engine.boards.Table
+import org.luxons.sevenwonders.engine.cards.Card
+import org.luxons.sevenwonders.model.cards.CardBack
+import org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.engine.cards.Requirements
+import org.luxons.sevenwonders.engine.effects.Effect
+import org.luxons.sevenwonders.engine.effects.ScienceProgress
+import org.luxons.sevenwonders.engine.moves.Move
+import org.luxons.sevenwonders.model.MoveType
+import org.luxons.sevenwonders.engine.moves.resolve
+import org.luxons.sevenwonders.engine.resources.Production
+import org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceTransaction
+import org.luxons.sevenwonders.model.resources.ResourceTransactions
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.noTransactions
+import org.luxons.sevenwonders.engine.resources.resourcesOf
+import org.luxons.sevenwonders.engine.wonders.Wonder
+import org.luxons.sevenwonders.engine.wonders.WonderStage
private const val SEED: Long = 42
@@ -75,8 +75,7 @@ internal fun createTransactions(provider: Provider, vararg resources: ResourceTy
internal fun createTransactions(vararg transactions: ResourceTransaction): ResourceTransactions = transactions.toSet()
internal fun createTransaction(provider: Provider, vararg resources: ResourceType): ResourceTransaction =
- ResourceTransaction(
- provider,
+ ResourceTransaction(provider,
resources.map { CountedResource(1, it) })
internal fun createRequirements(vararg types: ResourceType): Requirements = Requirements(resources = resourcesOf(*types))
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/wonders/WonderTest.kt
index 156055ff..1857ebe8 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/wonders/WonderTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/wonders/WonderTest.kt
@@ -1,8 +1,8 @@
-package org.luxons.sevenwonders.game.wonders
+package org.luxons.sevenwonders.engine.wonders
import org.junit.Test
-import org.luxons.sevenwonders.game.api.cards.CardBack
-import org.luxons.sevenwonders.game.test.testWonder
+import org.luxons.sevenwonders.model.cards.CardBack
+import org.luxons.sevenwonders.engine.test.testWonder
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/model/BoardsKtTest.kt
index ede165f7..1dd19704 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/BoardsKtTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/model/BoardsKtTest.kt
@@ -1,8 +1,10 @@
-package org.luxons.sevenwonders.game.api
+package org.luxons.sevenwonders.model
-import org.luxons.sevenwonders.game.api.cards.Color
-import org.luxons.sevenwonders.game.api.cards.TableCard
-import org.luxons.sevenwonders.game.test.testCard
+import org.luxons.sevenwonders.engine.converters.toColumns
+import org.luxons.sevenwonders.engine.converters.toTableCard
+import org.luxons.sevenwonders.engine.test.testCard
+import org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.model.cards.TableCard
import kotlin.test.Test
import kotlin.test.assertEquals
@@ -11,7 +13,7 @@ class BoardsKtTest {
@Test
fun `toColumns on empty list should return no cols`() {
val cols = emptyList<TableCard>().toColumns()
- assertEquals(emptyList<List<TableCard>>(), cols)
+ assertEquals(emptyList(), cols)
}
@Test
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/model/TableTest.kt
index 65bd2b1b..dc461c4d 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/game/api/TableTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/model/TableTest.kt
@@ -1,13 +1,13 @@
-package org.luxons.sevenwonders.game.api
+package org.luxons.sevenwonders.model
import org.junit.Assume.assumeTrue
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.api.boards.RelativeBoardPosition
-import org.luxons.sevenwonders.game.test.createGuildCards
-import org.luxons.sevenwonders.game.test.testTable
+import org.luxons.sevenwonders.model.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.engine.test.createGuildCards
+import org.luxons.sevenwonders.engine.test.testTable
import kotlin.test.assertEquals
@RunWith(Theories::class)
bgstack15