summaryrefslogtreecommitdiff
path: root/backend/src/test/java
diff options
context:
space:
mode:
authorJoffrey BION <joffrey.bion@gmail.com>2018-07-05 09:35:27 +0200
committerJoffrey Bion <joffrey.bion@amadeus.com>2018-07-06 14:17:16 +0200
commitccfd6d1d3ba64eef7df1645c24d979c284fd99da (patch)
tree441bc4e931fc998d86f642390096af4d30e9b85f /backend/src/test/java
parentPrevent PICK_NEIGHBOUR_GUILD action if no guild to pick (diff)
downloadseven-wonders-ccfd6d1d3ba64eef7df1645c24d979c284fd99da.tar.gz
seven-wonders-ccfd6d1d3ba64eef7df1645c24d979c284fd99da.tar.bz2
seven-wonders-ccfd6d1d3ba64eef7df1645c24d979c284fd99da.zip
Kotlin mig: api package
Diffstat (limited to 'backend/src/test/java')
-rw-r--r--backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java b/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java
index db165e83..567cd654 100644
--- a/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/controllers/LobbyControllerTest.java
@@ -13,7 +13,6 @@ import org.luxons.sevenwonders.actions.UpdateSettingsAction;
import org.luxons.sevenwonders.controllers.LobbyController.PlayerIsNotOwnerException;
import org.luxons.sevenwonders.controllers.LobbyController.PlayerNotInLobbyException;
import org.luxons.sevenwonders.game.api.CustomizableSettings;
-import org.luxons.sevenwonders.game.data.definitions.WonderSidePickMethod;
import org.luxons.sevenwonders.lobby.Lobby;
import org.luxons.sevenwonders.lobby.Player;
import org.luxons.sevenwonders.lobby.State;
@@ -28,6 +27,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.luxons.sevenwonders.game.data.definitions.WonderSidePickMethod.ALL_A;
public class LobbyControllerTest {
@@ -141,15 +141,7 @@ public class LobbyControllerTest {
assertEquals(new CustomizableSettings(), lobby.getSettings());
UpdateSettingsAction updateSettingsAction = new UpdateSettingsAction();
- CustomizableSettings newSettings = new CustomizableSettings();
- newSettings.setInitialGold(12);
- newSettings.setDefaultTradingCost(5);
- newSettings.setWonderSidePickMethod(WonderSidePickMethod.ALL_A);
- newSettings.setTimeLimitInSeconds(5);
- newSettings.setPointsPer3Gold(5);
- newSettings.setDiscardedCardGold(4);
- newSettings.setLostPointsPerDefeat(10);
- newSettings.setWonPointsPerVictoryPerAge(new HashMap<>());
+ CustomizableSettings newSettings = new CustomizableSettings(12L, 5, ALL_A, 5, 5, 4, 10, 2, new HashMap<>());
updateSettingsAction.setSettings(newSettings);
Principal principal = new TestPrincipal("testuser");
bgstack15