From c398c081ed4d83660ec867cabfb0ee9bc56b90ad Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Mon, 30 May 2011 19:50:58 +0200 Subject: =?UTF-8?q?Test=20f=C3=BCr=20=C3=84nderung=20der=20StoneSet=20Anza?= =?UTF-8?q?hl=20fertig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@327 72836036-5685-4462-b002-a69064685172 --- test/jrummikub/control/SettingsControlTest.java | 51 +++++++++++++++++-------- test/jrummikub/model/StoneHeapTest.java | 23 ++++++++--- 2 files changed, 53 insertions(+), 21 deletions(-) (limited to 'test') diff --git a/test/jrummikub/control/SettingsControlTest.java b/test/jrummikub/control/SettingsControlTest.java index 8fab97a..ff870d0 100644 --- a/test/jrummikub/control/SettingsControlTest.java +++ b/test/jrummikub/control/SettingsControlTest.java @@ -37,7 +37,8 @@ public class SettingsControlTest { /** */ @Test public void initialStateTest() { - assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error); + assertSame(ISettingsPanel.SettingsError.NO_ERROR, + view.settingsPanel.error); view.settingsPanel.startGameEvent.emit(); assertNotNull(gameSettings); assertEquals(2, gameSettings.getPlayerList().size()); @@ -156,7 +157,8 @@ public class SettingsControlTest { view.settingsPanel.changePlayerNameEvent.emit(1, name2); assertTrue(view.settingsPanel.startButtonEnabled); - assertSame(ISettingsPanel.SettingsError.NO_ERROR, view.settingsPanel.error); + assertSame(ISettingsPanel.SettingsError.NO_ERROR, + view.settingsPanel.error); view.settingsPanel.startGameEvent.emit(); assertNotNull(gameSettings); @@ -175,38 +177,57 @@ public class SettingsControlTest { view.settingsPanel.startGameEvent.emit(); assertNull(gameSettings); } - + /** */ @Test public void initialMeldThresholdTest() { - assertEquals(initialSettings.getInitialMeldThreshold(), view.settingsPanel.initialMeldThreshold); - + assertEquals(initialSettings.getInitialMeldThreshold(), + view.settingsPanel.initialMeldThreshold); + view.settingsPanel.changeInitialMeldThresholdEvent.emit(25); view.settingsPanel.startGameEvent.emit(); assertEquals(25, gameSettings.getInitialMeldThreshold()); } - + /** */ @Test public void jokerNumberTest() { - assertEquals(initialSettings.getJokerNumber(), view.settingsPanel.jokerNumber); - + assertEquals(initialSettings.getJokerNumber(), + view.settingsPanel.jokerNumber); + view.settingsPanel.changeJokerNumberEvent.emit(25); view.settingsPanel.startGameEvent.emit(); assertEquals(25, gameSettings.getJokerNumber()); } - + + /** */ + @Test + public void changeStoneSetNumberTest() { + assertEquals(initialSettings.getStoneSetNumber(), + view.settingsPanel.stoneSetNumber); + + view.settingsPanel.changeStoneSetNumberEvent.emit(3); + view.settingsPanel.startGameEvent.emit(); + assertEquals(3, gameSettings.getStoneSetNumber()); + + } + /** */ @Test public void typeChangeTest() { - view.settingsPanel.changePlayerTypeEvent.emit(0, TurnControlFactory.Type.COMPUTER); - view.settingsPanel.changePlayerTypeEvent.emit(1, TurnControlFactory.Type.COMPUTER); - view.settingsPanel.changePlayerTypeEvent.emit(1, TurnControlFactory.Type.HUMAN); + view.settingsPanel.changePlayerTypeEvent.emit(0, + TurnControlFactory.Type.COMPUTER); + view.settingsPanel.changePlayerTypeEvent.emit(1, + TurnControlFactory.Type.COMPUTER); + view.settingsPanel.changePlayerTypeEvent.emit(1, + TurnControlFactory.Type.HUMAN); view.settingsPanel.startGameEvent.emit(); assertNotNull(gameSettings); assertEquals(2, gameSettings.getPlayerList().size()); - assertSame(TurnControlFactory.Type.COMPUTER, gameSettings.getPlayerList().get(0).getTurnControlType()); - assertSame(TurnControlFactory.Type.HUMAN, gameSettings.getPlayerList().get(1).getTurnControlType()); + assertSame(TurnControlFactory.Type.COMPUTER, gameSettings + .getPlayerList().get(0).getTurnControlType()); + assertSame(TurnControlFactory.Type.HUMAN, gameSettings.getPlayerList() + .get(1).getTurnControlType()); } - + } diff --git a/test/jrummikub/model/StoneHeapTest.java b/test/jrummikub/model/StoneHeapTest.java index f625187..ffe0cdf 100644 --- a/test/jrummikub/model/StoneHeapTest.java +++ b/test/jrummikub/model/StoneHeapTest.java @@ -13,11 +13,20 @@ import static org.junit.Assert.*; */ public class StoneHeapTest { private StoneHeap testHeap; + private GameSettings testSettings; /** */ @Before public void createHeap() { - testHeap = new StoneHeap(new GameSettings()); + testHeap = new StoneHeap(testSettings = new GameSettings()); + } + + private int calculateTotalNumberOfStones() { + int totalStones = testSettings.getHighestCard() + * testSettings.getStoneSetNumber() + * testSettings.getStoneColors().size() + + testSettings.getJokerNumber(); + return totalStones; } /** @@ -25,7 +34,7 @@ public class StoneHeapTest { */ @Test public void fullStoneHeap() { - assertEquals(106, testHeap.heap.size()); + assertEquals(calculateTotalNumberOfStones(), testHeap.heap.size()); } /** @@ -33,6 +42,8 @@ public class StoneHeapTest { */ @Test public void fullColor() { + int stonesOfAColor = testSettings.getHighestCard() + * testSettings.getStoneSetNumber(); Map counters = new HashMap(); for (StoneColor c : EnumSet.allOf(StoneColor.class)) { counters.put(c, 0); @@ -44,7 +55,7 @@ public class StoneHeapTest { counters.put(i.getColor(), count + 1); } for (StoneColor c : EnumSet.allOf(StoneColor.class)) { - assertEquals(26, (long) counters.get(c)); + assertEquals(stonesOfAColor, (long) counters.get(c)); } } @@ -58,14 +69,14 @@ public class StoneHeapTest { if (i.isJoker()) countJoker++; } - assertEquals(2, countJoker); + assertEquals(testSettings.getJokerNumber(), countJoker); } /** */ @Test public void drawStoneTest() { assertNotNull(testHeap.drawStone()); - assertEquals(105, testHeap.heap.size()); + assertEquals(calculateTotalNumberOfStones() - 1, testHeap.heap.size()); } /** */ @@ -73,6 +84,6 @@ public class StoneHeapTest { public void drawStonesTest() { List testStones = testHeap.drawStones(5); assertEquals(5, testStones.size()); - assertEquals(101, testHeap.heap.size()); + assertEquals(calculateTotalNumberOfStones() - 5, testHeap.heap.size()); } } -- cgit v1.2.3