Upgrade ktlint and re-enable import order check

21 files changed, 41 insertions, 38 deletions

diff --git a/sw-engine/build.gradle.kts b/sw-engine/build.gradle.kts
index 9e6da395..ee3421f1 100644
--- a/sw-engine/build.gradle.kts
+++ b/sw-engine/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     kotlin("jvm")
-    id("org.jlleitschuh.gradle.ktlint")
 }
 
 dependencies {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt
index 595ca1e0..9e8e3e52 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/GameTest.kt
@@ -1,14 +1,18 @@
 package org.luxons.sevenwonders.engine
 
-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.engine.test.SEED
+import org.luxons.sevenwonders.engine.test.testSettings
+import org.luxons.sevenwonders.model.Action
+import org.luxons.sevenwonders.model.MoveType
+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.model.resources.ResourceTransactions
 import org.luxons.sevenwonders.model.resources.noTransactions
-import org.luxons.sevenwonders.engine.test.testSettings
-import org.luxons.sevenwonders.model.*
 import org.luxons.sevenwonders.model.wonders.deal
 import kotlin.random.Random
 import kotlin.test.Test
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/TableTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/TableTest.kt
index c37b71e1..7c22b069 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/TableTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/boards/TableTest.kt
@@ -5,9 +5,9 @@ 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.model.boards.RelativeBoardPosition
 import org.luxons.sevenwonders.engine.test.createGuildCards
 import org.luxons.sevenwonders.engine.test.testTable
+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/engine/cards/CardTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardTest.kt
index 2b0e5462..5f22acb3 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/CardTest.kt
@@ -2,16 +2,16 @@ package org.luxons.sevenwonders.engine.cards
 
 import org.junit.Test
 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 org.luxons.sevenwonders.model.cards.Color
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.noTransactions
 import kotlin.test.assertEquals
 
 class CardTest {
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt
index b8491434..f7bb45c0 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/HandsTest.kt
@@ -8,9 +8,9 @@ import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.cards.HandRotationDirection
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertFalse
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt
index 27b3cad0..889675a4 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/cards/RequirementsTest.kt
@@ -8,14 +8,14 @@ import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceType
+import org.luxons.sevenwonders.model.resources.noTransactions
 import kotlin.test.assertEquals
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt
index 709f2a87..664ccedc 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionIncreaseSerializerTest.kt
@@ -9,8 +9,8 @@ import org.junit.Test
 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 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/engine/data/serializers/ProductionSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionSerializerTest.kt
index 4af1d900..4a58e493 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ProductionSerializerTest.kt
@@ -8,8 +8,8 @@ import org.junit.Before
 import org.junit.Test
 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 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/engine/data/serializers/ResourcesSerializerTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourcesSerializerTest.kt
index c8074f2d..8a7e4f98 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourcesSerializerTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/data/serializers/ResourcesSerializerTest.kt
@@ -6,12 +6,12 @@ import com.google.gson.GsonBuilder
 import org.junit.Before
 import org.junit.Test
 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 org.luxons.sevenwonders.model.resources.ResourceType.CLAY
+import org.luxons.sevenwonders.model.resources.ResourceType.STONE
+import org.luxons.sevenwonders.model.resources.ResourceType.WOOD
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt
index ce914aab..1bb92f13 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/BonusPerBoardElementTest.kt
@@ -7,12 +7,12 @@ import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.model.cards.CardBack
+import org.luxons.sevenwonders.model.cards.Color
 import kotlin.test.assertEquals
 
 @RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt
index d989d24a..7df5ac35 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/DiscountTest.kt
@@ -5,10 +5,10 @@ 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.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 org.luxons.sevenwonders.model.resources.Provider
+import org.luxons.sevenwonders.model.resources.ResourceType
 import kotlin.test.assertEquals
 
 @RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt
index 67bb3862..59e8d48e 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/GoldIncreaseTest.kt
@@ -5,9 +5,9 @@ import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.resources.ResourceType
 import kotlin.test.assertEquals
 
 @RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt
index 23b5959e..f8e30b5a 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/MilitaryReinforcementsTest.kt
@@ -5,9 +5,9 @@ import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.resources.ResourceType
 import kotlin.test.assertEquals
 
 @RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt
index 235b2fa7..699803d0 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ProductionIncreaseTest.kt
@@ -5,11 +5,11 @@ import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.resources.ResourceType
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt
index b7f5e152..551018fc 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/ScienceProgressTest.kt
@@ -5,10 +5,10 @@ import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.resources.ResourceType
 import kotlin.test.assertEquals
 
 @RunWith(Theories::class)
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt
index 5a996369..6931e38f 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/effects/SpecialAbilityActivationTest.kt
@@ -7,11 +7,11 @@ import org.junit.experimental.theories.Theories
 import org.junit.experimental.theories.Theory
 import org.junit.runner.RunWith
 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 org.luxons.sevenwonders.model.boards.RelativeBoardPosition
+import org.luxons.sevenwonders.model.cards.Color
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt
index 8ff9aa33..a935fa7e 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/moves/BuildWonderMoveTest.kt
@@ -2,7 +2,6 @@ package org.luxons.sevenwonders.engine.moves
 
 import org.junit.Test
 import org.luxons.sevenwonders.engine.PlayerContext
-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
@@ -10,6 +9,7 @@ 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 org.luxons.sevenwonders.model.MoveType
 import org.luxons.sevenwonders.model.Settings
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
diff --git a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt
index a003a332..ba0fdf1b 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/BestPriceCalculatorTest.kt
@@ -3,6 +3,10 @@ package org.luxons.sevenwonders.engine.resources
 import org.junit.Test
 import org.luxons.sevenwonders.engine.SimplePlayer
 import org.luxons.sevenwonders.engine.boards.Table
+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 org.luxons.sevenwonders.model.resources.Provider.LEFT_PLAYER
 import org.luxons.sevenwonders.model.resources.Provider.RIGHT_PLAYER
 import org.luxons.sevenwonders.model.resources.ResourceTransactions
@@ -12,10 +16,6 @@ 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/engine/resources/ResourceTransactionsTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourceTransactionsTest.kt
index 665612e3..71c75d70 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourceTransactionsTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/ResourceTransactionsTest.kt
@@ -1,11 +1,11 @@
 package org.luxons.sevenwonders.engine.resources
 
 import org.junit.Test
+import org.luxons.sevenwonders.engine.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/engine/resources/TradingRulesTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/TradingRulesTest.kt
index 0301b16c..0b2e5261 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/TradingRulesTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/resources/TradingRulesTest.kt
@@ -5,11 +5,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.engine.test.createTransaction
+import org.luxons.sevenwonders.engine.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/engine/wonders/WonderTest.kt b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/wonders/WonderTest.kt
index 1857ebe8..b354f1b4 100644
--- a/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/wonders/WonderTest.kt
+++ b/sw-engine/src/test/kotlin/org/luxons/sevenwonders/engine/wonders/WonderTest.kt
@@ -1,8 +1,8 @@
 package org.luxons.sevenwonders.engine.wonders
 
 import org.junit.Test
-import org.luxons.sevenwonders.model.cards.CardBack
 import org.luxons.sevenwonders.engine.test.testWonder
+import org.luxons.sevenwonders.model.cards.CardBack
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith