From 58b19462884a536876c0a038be3a755a4c0fcae6 Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Sun, 24 May 2020 20:53:28 +0200 Subject: Cleanup imports --- .../sevenwonders/server/controllers/LobbyControllerTest.kt | 12 ++++-------- .../kotlin/org/luxons/sevenwonders/server/lobby/LobbyTest.kt | 7 +------ .../sevenwonders/server/repositories/LobbyRepositoryTest.kt | 6 +----- .../sevenwonders/server/repositories/PlayerRepositoryTest.kt | 6 +----- 4 files changed, 7 insertions(+), 24 deletions(-) (limited to 'sw-server/src/test/kotlin') diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/controllers/LobbyControllerTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/controllers/LobbyControllerTest.kt index 31a3c9c9..9aa1ef0e 100644 --- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/controllers/LobbyControllerTest.kt +++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/controllers/LobbyControllerTest.kt @@ -2,25 +2,21 @@ package org.luxons.sevenwonders.server.controllers import org.junit.Before import org.junit.Test -import org.luxons.sevenwonders.model.api.actions.ReorderPlayersAction -import org.luxons.sevenwonders.model.api.actions.UpdateSettingsAction import org.luxons.sevenwonders.model.CustomizableSettings import org.luxons.sevenwonders.model.WonderSidePickMethod.ALL_A +import org.luxons.sevenwonders.model.api.State +import org.luxons.sevenwonders.model.api.actions.ReorderPlayersAction +import org.luxons.sevenwonders.model.api.actions.UpdateSettingsAction import org.luxons.sevenwonders.server.lobby.Lobby import org.luxons.sevenwonders.server.lobby.Player import org.luxons.sevenwonders.server.lobby.PlayerIsNotOwnerException import org.luxons.sevenwonders.server.lobby.PlayerNotInLobbyException -import org.luxons.sevenwonders.model.api.State import org.luxons.sevenwonders.server.repositories.LobbyRepository import org.luxons.sevenwonders.server.repositories.PlayerNotFoundException import org.luxons.sevenwonders.server.repositories.PlayerRepository import org.luxons.sevenwonders.server.test.mockSimpMessagingTemplate import java.util.HashMap -import kotlin.test.assertEquals -import kotlin.test.assertFailsWith -import kotlin.test.assertFalse -import kotlin.test.assertSame -import kotlin.test.assertTrue +import kotlin.test.* class LobbyControllerTest { diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/lobby/LobbyTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/lobby/LobbyTest.kt index 80f5e866..094fe7de 100644 --- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/lobby/LobbyTest.kt +++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/lobby/LobbyTest.kt @@ -17,12 +17,7 @@ import org.luxons.sevenwonders.server.lobby.Lobby.PlayerNameAlreadyUsedException import org.luxons.sevenwonders.server.lobby.Lobby.PlayerOverflowException import org.luxons.sevenwonders.server.lobby.Lobby.PlayerUnderflowException import org.luxons.sevenwonders.server.lobby.Lobby.UnknownPlayerException -import kotlin.test.assertEquals -import kotlin.test.assertFailsWith -import kotlin.test.assertFalse -import kotlin.test.assertNotNull -import kotlin.test.assertSame -import kotlin.test.assertTrue +import kotlin.test.* @RunWith(Theories::class) class LobbyTest { diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/LobbyRepositoryTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/LobbyRepositoryTest.kt index c59dc49f..898a56fc 100644 --- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/LobbyRepositoryTest.kt +++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/LobbyRepositoryTest.kt @@ -3,11 +3,7 @@ package org.luxons.sevenwonders.server.repositories import org.junit.Before import org.junit.Test import org.luxons.sevenwonders.server.lobby.Player -import kotlin.test.assertFailsWith -import kotlin.test.assertNotNull -import kotlin.test.assertSame -import kotlin.test.assertTrue -import kotlin.test.fail +import kotlin.test.* class LobbyRepositoryTest { diff --git a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/PlayerRepositoryTest.kt b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/PlayerRepositoryTest.kt index fc016903..b5c849a7 100644 --- a/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/PlayerRepositoryTest.kt +++ b/sw-server/src/test/kotlin/org/luxons/sevenwonders/server/repositories/PlayerRepositoryTest.kt @@ -2,11 +2,7 @@ package org.luxons.sevenwonders.server.repositories import org.junit.Before import org.junit.Test -import kotlin.test.assertEquals -import kotlin.test.assertFailsWith -import kotlin.test.assertFalse -import kotlin.test.assertSame -import kotlin.test.assertTrue +import kotlin.test.* class PlayerRepositoryTest { -- cgit