summaryrefslogtreecommitdiffstats
path: root/test/jrummikub/control
diff options
context:
space:
mode:
Diffstat (limited to 'test/jrummikub/control')
-rw-r--r--test/jrummikub/control/GameControlTest.java14
-rw-r--r--test/jrummikub/control/RoundControlTest.java124
-rw-r--r--test/jrummikub/control/turn/TurnControlTest.java14
3 files changed, 70 insertions, 82 deletions
diff --git a/test/jrummikub/control/GameControlTest.java b/test/jrummikub/control/GameControlTest.java
index 706928c..db60b05 100644
--- a/test/jrummikub/control/GameControlTest.java
+++ b/test/jrummikub/control/GameControlTest.java
@@ -1,8 +1,7 @@
package jrummikub.control;
-import static jrummikub.model.StoneColor.RED;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static jrummikub.model.StoneColor.*;
+import static org.junit.Assert.*;
import java.awt.Color;
@@ -12,6 +11,7 @@ import jrummikub.model.PlayerSettings;
import jrummikub.model.Position;
import jrummikub.model.Stone;
import jrummikub.util.Pair;
+import jrummikub.view.IView.BottomPanelType;
import jrummikub.view.MockView;
import org.junit.Before;
@@ -41,7 +41,7 @@ public class GameControlTest {
@Test
public void testStartFirstRound() {
gameControl.startGame();
- assertTrue(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
}
/** */
@@ -75,10 +75,10 @@ public class GameControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertTrue(view.displayWinPanel);
+ assertSame(BottomPanelType.WIN_PANEL, view.bottomPanelType);
view.newRoundEvent.emit();
- assertTrue(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
}
/** */
@@ -91,7 +91,7 @@ public class GameControlTest {
view.playerPanel.endTurnEvent.emit();
view.startTurnEvent.emit();
view.playerPanel.redealEvent.emit();
- assertTrue(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
view.startTurnEvent.emit();
assertSame(firstPlayer, gameControl.roundControl.roundState
.getActivePlayer().getPlayerSettings());
diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index d73018c..49db913 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -28,6 +28,7 @@ import jrummikub.model.Table;
import jrummikub.util.IListener;
import jrummikub.util.IListener1;
import jrummikub.util.Pair;
+import jrummikub.view.IView.BottomPanelType;
import jrummikub.view.MockView;
import org.junit.Before;
@@ -70,24 +71,21 @@ public class RoundControlTest {
gameSettings.getPlayerList().add(new PlayerSettings("Ida", Color.RED));
gameSettings.getPlayerList().add(
new PlayerSettings("Matthias", Color.YELLOW));
- gameSettings.getPlayerList().add(
- new PlayerSettings("Jannis", Color.GREEN));
- gameSettings.getPlayerList().add(
- new PlayerSettings("Bennet", Color.BLACK));
+ gameSettings.getPlayerList().add(new PlayerSettings("Jannis", Color.GREEN));
+ gameSettings.getPlayerList().add(new PlayerSettings("Bennet", Color.BLACK));
roundState = new RoundState(gameSettings);
roundControl = new RoundControl(roundState, view);
}
private void checkCorrectlyDealt() {
GameSettings settings = testRoundState.getGameSettings();
- int totalStones = settings.getHighestValue()
- * settings.getStoneSetNumber()
+ int totalStones = settings.getHighestValue() * settings.getStoneSetNumber()
* settings.getStoneColors().size() + settings.getJokerNumber();
assertEquals(
totalStones - testRoundState.getPlayerCount()
* settings.getNumberOfStonesDealt()
- - testRoundState.table.getSize(), testRoundState
- .getGameHeap().getSize());
+ - testRoundState.table.getSize(), testRoundState.getGameHeap()
+ .getSize());
for (int i = 0; i < testRoundState.getPlayerCount(); i++) {
assertEquals(settings.getNumberOfStonesDealt(), testRoundState
.getNthNextPlayer(i).getHand().getSize());
@@ -97,9 +95,9 @@ public class RoundControlTest {
private void checkTurnStartSetUp() {
assertNotNull(view.currentPlayerName);
// TODO Check player list in view
- assertTrue(view.displayStartTurnPanel);
+
+ assertSame(BottomPanelType.START_TURN_PANEL, view.bottomPanelType);
assertFalse(view.startTurnEvent.listeners.isEmpty());
- assertFalse(view.displayWinPanel);
checkTableDisplay();
}
@@ -119,7 +117,7 @@ public class RoundControlTest {
private void resetTurnStart() {
view.currentPlayerName = null;
// TODO reset player list
- view.displayStartTurnPanel = false;
+ view.bottomPanelType = null;
}
/**
@@ -162,8 +160,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertFalse(roundState
- .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
+ .getLaidOut());
assertEquals(0, roundState.getTable().getSize());
assertEquals(14 + 6, hand.getSize());
}
@@ -183,8 +181,8 @@ public class RoundControlTest {
assertFalse(roundState.getActivePlayer().getLaidOut());
view.playerPanel.endTurnEvent.emit();
- assertFalse(roundState
- .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
+ .getLaidOut());
assertEquals(0, roundState.getTable().getSize());
assertEquals(14 + 1, hand.getSize());
}
@@ -231,8 +229,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertFalse(roundState
- .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
+ .getLaidOut());
assertEquals(0, roundState.getTable().getSize());
assertEquals(14 + 9, hand.getSize());
}
@@ -302,8 +300,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertFalse(roundState
- .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
+ .getLaidOut());
assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 6, hand.getSize());
}
@@ -376,8 +374,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertFalse(roundState
- .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
+ .getLaidOut());
assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 7, hand.getSize());
}
@@ -440,8 +438,8 @@ public class RoundControlTest {
view.tablePanel.clickEvent.emit(new Position(0, 0));
view.playerPanel.endTurnEvent.emit();
- assertFalse(roundState
- .getNthNextPlayer(roundState.getPlayerCount() - 1).getLaidOut());
+ assertFalse(roundState.getNthNextPlayer(roundState.getPlayerCount() - 1)
+ .getLaidOut());
assertEquals(2, roundState.getTable().getSize());
assertEquals(14 + 3, hand.getSize());
}
@@ -547,7 +545,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable;
view.startTurnEvent.emit();
- assertFalse(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
IHand hand = testRoundState.players.get(0).hand;
hand.pickUp(hand.iterator().next().getFirst());
@@ -573,7 +571,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable;
view.startTurnEvent.emit();
- assertFalse(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
IHand hand = testRoundState.players.get(0).hand;
Stone stone = hand.iterator().next().getFirst();
hand.pickUp(stone);
@@ -601,7 +599,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable;
view.startTurnEvent.emit();
- assertFalse(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
@@ -626,7 +624,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable;
view.startTurnEvent.emit();
- assertFalse(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit();
@@ -658,7 +656,7 @@ public class RoundControlTest {
oldTable.clonedTable = testTable;
view.startTurnEvent.emit();
- assertFalse(view.displayStartTurnPanel);
+ assertSame(BottomPanelType.HUMAN_HAND_PANEL, view.bottomPanelType);
IHand hand = testRoundState.players.get(0).hand;
Stone blueEight = new Stone(8, BLUE);
@@ -699,15 +697,12 @@ public class RoundControlTest {
Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE);
Stone blueFour = new Stone(4, BLUE);
- StoneSet oldSet1 = new StoneSet(
- Arrays.asList(blueOne, redOne, blackOne));
+ StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne, blackOne));
StoneSet oldSet2 = new StoneSet(blueTwo);
oldTable.drop(oldSet1, new Position(0, 0));
oldTable.drop(oldSet2, new Position(0, 0));
- StoneSet newSet1 = new StoneSet(Arrays.asList(blueOne, blueTwo,
- blueFour));
- StoneSet newSet2 = new StoneSet(Arrays.asList(redOne, blackOne,
- blueThree));
+ StoneSet newSet1 = new StoneSet(Arrays.asList(blueOne, blueTwo, blueFour));
+ StoneSet newSet2 = new StoneSet(Arrays.asList(redOne, blackOne, blueThree));
newTable.drop(newSet1, new Position(0, 0));
newTable.drop(newSet2, new Position(0, 0));
@@ -732,15 +727,14 @@ public class RoundControlTest {
Stone blueTwo = new Stone(2, BLUE);
Stone blueThree = new Stone(3, BLUE);
Stone blueFour = new Stone(4, BLUE);
- StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne,
- blackOne, orangeOne));
- StoneSet oldSet2 = new StoneSet(Arrays.asList(blueTwo, blueThree,
- blueFour));
+ StoneSet oldSet1 = new StoneSet(Arrays.asList(blueOne, redOne, blackOne,
+ orangeOne));
+ StoneSet oldSet2 = new StoneSet(Arrays.asList(blueTwo, blueThree, blueFour));
oldTable.drop(oldSet1, new Position(0, 0));
oldTable.drop(oldSet2, new Position(0, 0));
ITable newTable = (Table) oldTable.clone();
- List<StoneSet> newSets = RoundControl.tableSetDifference(oldTable,
- newTable);
+ List<StoneSet> newSets = RoundControl
+ .tableSetDifference(oldTable, newTable);
List<StoneSet> vanishedSets = RoundControl.tableSetDifference(newTable,
oldTable);
@@ -748,8 +742,8 @@ public class RoundControlTest {
assertTrue(vanishedSets.isEmpty());
newTable.pickUp(oldSet2);
- newTable.drop(oldSet2.join(new StoneSet(new Stone(5, BLUE))),
- new Position(0, 0));
+ newTable.drop(oldSet2.join(new StoneSet(new Stone(5, BLUE))), new Position(
+ 0, 0));
newSets = RoundControl.tableSetDifference(oldTable, newTable);
vanishedSets = RoundControl.tableSetDifference(newTable, oldTable);
@@ -761,8 +755,7 @@ public class RoundControlTest {
Stone redTwo = new Stone(2, RED);
Stone redThree = new Stone(3, RED);
Stone redFour = new Stone(4, RED);
- StoneSet oldSet3 = new StoneSet(
- Arrays.asList(redTwo, redThree, redFour));
+ StoneSet oldSet3 = new StoneSet(Arrays.asList(redTwo, redThree, redFour));
ITable newTable2 = (Table) oldTable.clone();
newTable2.drop(oldSet3, new Position(0, 0));
newSets = RoundControl.tableSetDifference(oldTable, newTable2);
@@ -824,20 +817,19 @@ public class RoundControlTest {
}
testRoundState.players.get(0).laidOut = true;
- testRoundState.players.get(0).hand.drop(new Stone(1, RED),
- new Position(0, 0));
- testRoundState.players.get(0).hand.drop(new Stone(2, RED),
- new Position(0, 0));
- testRoundState.players.get(1).laidOut = true;
- testRoundState.players.get(1).hand.drop(new Stone(RED), new Position(0,
+ testRoundState.players.get(0).hand.drop(new Stone(1, RED), new Position(0,
0));
+ testRoundState.players.get(0).hand.drop(new Stone(2, RED), new Position(0,
+ 0));
+ testRoundState.players.get(1).laidOut = true;
+ testRoundState.players.get(1).hand.drop(new Stone(RED), new Position(0, 0));
testRoundState.players.get(2).laidOut = false;
- testRoundState.players.get(2).hand.drop(new Stone(9, RED),
- new Position(0, 0));
- testRoundState.players.get(2).hand.drop(new Stone(10, RED),
- new Position(0, 0));
- testRoundState.players.get(2).hand.drop(new Stone(11, RED),
- new Position(0, 0));
+ testRoundState.players.get(2).hand.drop(new Stone(9, RED), new Position(0,
+ 0));
+ testRoundState.players.get(2).hand.drop(new Stone(10, RED), new Position(0,
+ 0));
+ testRoundState.players.get(2).hand.drop(new Stone(11, RED), new Position(0,
+ 0));
testRoundState.players.get(3).laidOut = true;
testRound.endOfRound();
@@ -871,19 +863,19 @@ public class RoundControlTest {
}
testRoundState.players.get(0).laidOut = true;
- testRoundState.players.get(0).hand.drop(new Stone(1, RED),
- new Position(0, 0));
- testRoundState.players.get(0).hand.drop(new Stone(2, RED),
- new Position(0, 0));
+ testRoundState.players.get(0).hand.drop(new Stone(1, RED), new Position(0,
+ 0));
+ testRoundState.players.get(0).hand.drop(new Stone(2, RED), new Position(0,
+ 0));
testRoundState.players.get(1).laidOut = true;
- testRoundState.players.get(1).hand.drop(new Stone(3, RED),
- new Position(0, 0));
+ testRoundState.players.get(1).hand.drop(new Stone(3, RED), new Position(0,
+ 0));
testRoundState.players.get(2).laidOut = true;
- testRoundState.players.get(2).hand.drop(new Stone(3, BLUE),
- new Position(0, 0));
+ testRoundState.players.get(2).hand.drop(new Stone(3, BLUE), new Position(0,
+ 0));
testRoundState.players.get(3).laidOut = false;
- testRoundState.players.get(3).hand.drop(new Stone(13, RED),
- new Position(0, 0));
+ testRoundState.players.get(3).hand.drop(new Stone(13, RED), new Position(0,
+ 0));
testRound.endOfRound();
assertTrue(roundEnded);
diff --git a/test/jrummikub/control/turn/TurnControlTest.java b/test/jrummikub/control/turn/TurnControlTest.java
index 89d22bf..a59197f 100644
--- a/test/jrummikub/control/turn/TurnControlTest.java
+++ b/test/jrummikub/control/turn/TurnControlTest.java
@@ -1,12 +1,7 @@
package jrummikub.control.turn;
-import static jrummikub.model.StoneColor.BLACK;
-import static jrummikub.model.StoneColor.BLUE;
-import static jrummikub.model.StoneColor.RED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static jrummikub.model.StoneColor.*;
+import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,6 +27,7 @@ import jrummikub.util.Event;
import jrummikub.util.IEvent;
import jrummikub.util.IListener;
import jrummikub.util.Pair;
+import jrummikub.view.IView.BottomPanelType;
import jrummikub.view.MockView;
import org.junit.Before;
@@ -130,7 +126,7 @@ public class TurnControlTest {
@SuppressWarnings("unchecked")
@Test
public void showInitialHand() {
- mockView.displayStartTurnPanel = true;
+ mockView.bottomPanelType = BottomPanelType.START_TURN_PANEL;
List<Pair<Stone, Position>> stones = Arrays.asList(
new Pair<Stone, Position>(new Stone(RED), new Position(0, 0)),
@@ -150,7 +146,7 @@ public class TurnControlTest {
}
assertEquals(stones.size(), i);
- assertFalse(mockView.displayStartTurnPanel);
+ assertSame(BottomPanelType.HUMAN_HAND_PANEL, mockView.bottomPanelType);
}
/** */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 08:10:23 +0100