Implemented routine to check if initial melds are possible

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@266 72836036-5685-4462-b002-a69064685172

2 files changed, 5 insertions, 1 deletions

diff --git a/test/jrummikub/control/RoundControlTest.java b/test/jrummikub/control/RoundControlTest.java
index 9894e35..2d316d8 100644
--- a/test/jrummikub/control/RoundControlTest.java
+++ b/test/jrummikub/control/RoundControlTest.java
@@ -332,6 +332,7 @@ public class RoundControlTest {
 		assertEquals(14 + 7, hand.getSize());
 	}
 
+	/** */
 	@Test
 	public void laidOutJustChangedTable() {
 		roundControl.startRound();
@@ -631,6 +632,7 @@ public class RoundControlTest {
 		assertTrue(stones.containsAll(expectedStones));
 	}
 
+	/** */
 	@Test
 	public void testTableSetDifference() {
 		ITable oldTable = new Table();
@@ -682,6 +684,7 @@ public class RoundControlTest {
 		assertEquals(1, newSets.size());
 	}
 	
+	/** */
 	@Test
 	public void heapIsEmpty() {
 		roundState.getGameHeap().drawStones(106 - 14 * 4 - 1);
diff --git a/test/jrummikub/model/HandTest.java b/test/jrummikub/model/HandTest.java
index 5aa662c..5396bd8 100644
--- a/test/jrummikub/model/HandTest.java
+++ b/test/jrummikub/model/HandTest.java
@@ -133,6 +133,7 @@ public class HandTest {
 	}

 

 	private void testInitialMeld(boolean possible, List<Stone> handStones) {

+		hand = new Hand(new GameSettings());

 		for (Stone stone : handStones) {

 			hand.drop(stone, new Position(0, 0));

 		}

@@ -141,7 +142,7 @@ public class HandTest {
 

 	/** */

 	@Test

-	public void testNoValid() {

+	public void testInvalid() {

 		testInitialMeld(false, Arrays.asList(new Stone(8, RED), new Stone(9,

 				RED), new Stone(10, RED), new Stone(12, RED),

 				new Stone(13, RED)));