From 82c58a1eae3c818274db1b29c5d539f174060835 Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Sun, 8 May 2011 18:10:07 +0200 Subject: getPlayer entfernt, weil es getNthNextPlayer gibt. Warnings beseitigt. git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@170 72836036-5685-4462-b002-a69064685172 --- mock/jrummikub/model/MockGameState.java | 5 ---- src/jrummikub/control/RoundControl.java | 4 +-- src/jrummikub/model/GameState.java | 5 ---- src/jrummikub/model/IGameState.java | 3 +- test/jrummikub/control/RoundControlTest.java | 3 +- test/jrummikub/control/TurnControlTest.java | 42 +++++++++++++++++++--------- 6 files changed, 32 insertions(+), 30 deletions(-) diff --git a/mock/jrummikub/model/MockGameState.java b/mock/jrummikub/model/MockGameState.java index fd83e55..377bd1d 100644 --- a/mock/jrummikub/model/MockGameState.java +++ b/mock/jrummikub/model/MockGameState.java @@ -32,11 +32,6 @@ public class MockGameState implements IGameState { return players.size(); } - @Override - public IPlayer getPlayer(int i) { - return players.get(i); - } - /** Changes the activePlayer to the next {@link Player} in the list */ @Override public void nextPlayer() { diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java index 231b860..efa6f62 100644 --- a/src/jrummikub/control/RoundControl.java +++ b/src/jrummikub/control/RoundControl.java @@ -66,7 +66,7 @@ public class RoundControl { void deal() { for (int i = 0; i < gameState.getPlayerCount(); i++) { - IHand hand = gameState.getPlayer(i).getHand(); + IHand hand = gameState.getNthNextPlayer(i).getHand(); for (int j = 0; j < 7; j++) { hand.drop(gameState.getGameHeap().drawStone(), new Position(j, 0)); hand.drop(gameState.getGameHeap().drawStone(), new Position(j, 1)); @@ -81,8 +81,6 @@ public class RoundControl { if (clonedTable.isValid()) { gameState.setTable(clonedTable); - System.err.println(gameState.getActivePlayer().getName()); - System.err.println(gameState.getActivePlayer().getHand().getSize()); if (gameState.getActivePlayer().getHand().getSize() == 0) { win(); return; diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/GameState.java index d9f18b3..1f0ef29 100644 --- a/src/jrummikub/model/GameState.java +++ b/src/jrummikub/model/GameState.java @@ -37,11 +37,6 @@ public class GameState implements IGameState { return players.size(); } - @Override - public IPlayer getPlayer(int i) { - return players.get(i); - } - /** Changes the activePlayer to the next {@link Player} in the list */ @Override public void nextPlayer() { diff --git a/src/jrummikub/model/IGameState.java b/src/jrummikub/model/IGameState.java index df98a2c..8e64bc4 100644 --- a/src/jrummikub/model/IGameState.java +++ b/src/jrummikub/model/IGameState.java @@ -3,12 +3,11 @@ package jrummikub.model; public interface IGameState { public ITable getTable(); + public void setTable(ITable table); public int getPlayerCount(); - public IPlayer getPlayer(int i); - /** Changes the activePlayer to the next {@link Player} in the list */ public void nextPlayer(); diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java index 159df9d..9569fbd 100644 --- a/test/jrummikub/control/RoundControlTest.java +++ b/test/jrummikub/control/RoundControlTest.java @@ -6,7 +6,6 @@ import static jrummikub.model.StoneColor.RED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -50,7 +49,7 @@ public class RoundControlTest { - testGameState.table.getSize(), testGameState.getGameHeap() .getSize()); for (int i = 0; i < testGameState.getPlayerCount(); i++) { - assertEquals(14, testGameState.getPlayer(i).getHand().getSize()); + assertEquals(14, testGameState.getNthNextPlayer(i).getHand().getSize()); } } diff --git a/test/jrummikub/control/TurnControlTest.java b/test/jrummikub/control/TurnControlTest.java index 27d9aec..da8c83f 100644 --- a/test/jrummikub/control/TurnControlTest.java +++ b/test/jrummikub/control/TurnControlTest.java @@ -78,14 +78,15 @@ public class TurnControlTest { mockView.displayStartTurnPanel = true; - List> stones = Arrays.asList( - new Pair(new Stone(RED), new Position(0, 0)), - new Pair(new Stone(BLACK), new Position(1, 0))); + List> stones = Arrays + .asList(new Pair(new Stone(RED), new Position( + 0, 0)), new Pair(new Stone(BLACK), + new Position(1, 0))); mockHand.iterable = stones; testControl = new TurnControl(mockHand, mockTable, mockView, mockTimer); - + testControl.startTurn(); int i = 0; @@ -118,7 +119,6 @@ public class TurnControlTest { assertTrue(mockView.playerPanel.endTurnEvent.listeners.isEmpty()); } - @Test public void timerEndOfTurn() { eventFired = false; @@ -146,11 +146,10 @@ public class TurnControlTest { // Select first stone mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, false); mockTimer.timeRunOutEvent.emit(); - + assertCollection(new ArrayList()); } - @Test public void selectStoneInHand() { @@ -199,8 +198,8 @@ public class TurnControlTest { mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true); mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true); - mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(firstStone, - false); + mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit( + firstStone, false); assertCollection(Arrays.asList(secondStone)); } @@ -214,8 +213,8 @@ public class TurnControlTest { mockView.playerPanel.handPanel.stoneClickEvent.emit(firstStone, true); mockView.playerPanel.handPanel.stoneClickEvent.emit(secondStone, true); - mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit(firstStone, - true); + mockView.tablePanel.stoneCollectionPanel.stoneClickEvent.emit( + firstStone, true); assertCollection(Arrays.asList(secondStone, firstStone)); } @@ -320,7 +319,8 @@ public class TurnControlTest { Stone stone2 = new Stone(2, StoneColor.RED); Stone stone3 = new Stone(3, StoneColor.RED); Stone stone4 = new Stone(4, StoneColor.RED); - StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, stone4)); + StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, + stone4)); mockTable.findStoneSet.put(stone1, set1); mockTable.findStoneSet.put(stone3, set1); @@ -340,7 +340,8 @@ public class TurnControlTest { Stone stone2 = new Stone(2, StoneColor.RED); Stone stone3 = new Stone(3, StoneColor.RED); Stone stone4 = new Stone(4, StoneColor.RED); - StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, stone4)); + StoneSet set1 = new StoneSet(Arrays.asList(stone1, stone2, stone3, + stone4)); mockTable.findStoneSet.put(stone1, set1); mockTable.findStoneSet.put(stone3, set1); @@ -402,4 +403,19 @@ public class TurnControlTest { ArrayList expectedStones = new ArrayList(expected); assertEquals(expectedStones, selectedStones); } + + @Test + public void takeLeftStone() { + + } + + @Test + public void takeRightStone() { + + } + + @Test + public void takeMiddleStone() { + + } } -- cgit v1.2.3