kleine fixes

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

2 files changed, 28 insertions, 28 deletions

diff --git a/test/jrummikub/control/turn/TurnControlTest.java b/test/jrummikub/control/turn/TurnControlTest.java
index 4784f98..ed0b758 100644
--- a/test/jrummikub/control/turn/TurnControlTest.java
+++ b/test/jrummikub/control/turn/TurnControlTest.java
@@ -663,7 +663,7 @@ public class TurnControlTest {
 		// tablecheck
 		assertEquals(2, table.getSize());
 		StoneSet newSet1, newSet2;
-		if (table.getSetArray()[0].size() == 3) {
+		if (table.getSetArray()[0].getSize() == 3) {
 			newSet2 = table.getSetArray()[0];
 			newSet1 = table.getSetArray()[1];
 		} else {
@@ -672,7 +672,7 @@ public class TurnControlTest {
 		}
 		assertSame(oldSet2, newSet2);
 		// setcheck
-		assertEquals(9, newSet1.size());
+		assertEquals(9, newSet1.getSize());
 		assertSame(newSet1.get(0), blueThree);
 		assertSame(newSet1.get(1), redOne);
 		assertSame(newSet1.get(2), redThree);
@@ -691,7 +691,7 @@ public class TurnControlTest {
 		assertSame(mockHand.stones.get(0).getFirst(), blueFour);
 		// tablecheck
 		assertEquals(2, table.getSize());
-		if (table.getSetArray()[0].size() == 5) {
+		if (table.getSetArray()[0].getSize() == 5) {
 			newSet2 = table.getSetArray()[0];
 			newSet1 = table.getSetArray()[1];
 		} else {
@@ -699,7 +699,7 @@ public class TurnControlTest {
 			newSet2 = table.getSetArray()[1];
 		}
 		// setcheck1
-		assertEquals(7, newSet1.size());
+		assertEquals(7, newSet1.getSize());
 		assertSame(newSet1.get(0), blueThree);
 		assertSame(newSet1.get(1), blueOne);
 		assertSame(newSet1.get(2), blackOne);
@@ -708,7 +708,7 @@ public class TurnControlTest {
 		assertSame(newSet1.get(5), blackTwo);
 		assertSame(newSet1.get(6), blackThree);
 		// setcheck2
-		assertEquals(5, newSet2.size());
+		assertEquals(5, newSet2.getSize());
 		assertSame(newSet2.get(0), redOne);
 		assertSame(newSet2.get(1), redThree);
 		assertSame(newSet2.get(2), blueTwo);
@@ -723,7 +723,7 @@ public class TurnControlTest {
 		assertEquals(0, mockHand.getSize());
 		// tablecheck
 		assertEquals(2, table.getSize());
-		if (table.getSetArray()[0].size() == 6) {
+		if (table.getSetArray()[0].getSize() == 6) {
 			newSet2 = table.getSetArray()[0];
 			newSet1 = table.getSetArray()[1];
 		} else {
@@ -731,9 +731,9 @@ public class TurnControlTest {
 			newSet2 = table.getSetArray()[1];
 		}
 		// setcheck1
-		assertEquals(7, newSet1.size());
+		assertEquals(7, newSet1.getSize());
 		// setcheck2
-		assertEquals(6, newSet2.size());
+		assertEquals(6, newSet2.getSize());
 		assertSame(newSet2.get(0), blueFour);
 		assertSame(newSet2.get(1), redOne);
 		assertSame(newSet2.get(2), redThree);
@@ -781,7 +781,7 @@ public class TurnControlTest {
 		// tablecheck
 		assertEquals(2, table.getSize());
 		StoneSet newSet1, newSet2;
-		if (table.getSetArray()[0].size() == 3) {
+		if (table.getSetArray()[0].getSize() == 3) {
 			newSet2 = table.getSetArray()[0];
 			newSet1 = table.getSetArray()[1];
 		} else {
@@ -790,7 +790,7 @@ public class TurnControlTest {
 		}
 		assertSame(oldSet2, newSet2);
 		// setcheck
-		assertEquals(9, newSet1.size());
+		assertEquals(9, newSet1.getSize());
 		assertSame(newSet1.get(0), blueOne);
 		assertSame(newSet1.get(1), blackOne);
 		assertSame(newSet1.get(2), redTwo);
@@ -809,7 +809,7 @@ public class TurnControlTest {
 		assertSame(mockHand.stones.get(0).getFirst(), blueFour);
 		// tablecheck
 		assertEquals(2, table.getSize());
-		if (table.getSetArray()[0].size() == 5) {
+		if (table.getSetArray()[0].getSize() == 5) {
 			newSet2 = table.getSetArray()[0];
 			newSet1 = table.getSetArray()[1];
 		} else {
@@ -817,7 +817,7 @@ public class TurnControlTest {
 			newSet2 = table.getSetArray()[1];
 		}
 		// setcheck1
-		assertEquals(7, newSet1.size());
+		assertEquals(7, newSet1.getSize());
 		assertSame(newSet1.get(0), blueOne);
 		assertSame(newSet1.get(1), blackOne);
 		assertSame(newSet1.get(2), redTwo);
@@ -826,7 +826,7 @@ public class TurnControlTest {
 		assertSame(newSet1.get(5), blackThree);
 		assertSame(newSet1.get(6), blueThree);
 		// setcheck2
-		assertEquals(5, newSet2.size());
+		assertEquals(5, newSet2.getSize());
 		assertSame(newSet2.get(0), blueTwo);
 		assertSame(newSet2.get(1), blackFour);
 		assertSame(newSet2.get(2), blackFive);
@@ -841,7 +841,7 @@ public class TurnControlTest {
 		assertEquals(0, mockHand.getSize());
 		// tablecheck
 		assertEquals(2, table.getSize());
-		if (table.getSetArray()[0].size() == 6) {
+		if (table.getSetArray()[0].getSize() == 6) {
 			newSet2 = table.getSetArray()[0];
 			newSet1 = table.getSetArray()[1];
 		} else {
@@ -849,9 +849,9 @@ public class TurnControlTest {
 			newSet2 = table.getSetArray()[1];
 		}
 		// setcheck1
-		assertEquals(7, newSet1.size());
+		assertEquals(7, newSet1.getSize());
 		// setcheck2
-		assertEquals(6, newSet2.size());
+		assertEquals(6, newSet2.getSize());
 		assertSame(newSet2.get(0), blueTwo);
 		assertSame(newSet2.get(1), blackFour);
 		assertSame(newSet2.get(2), blackFive);
@@ -900,18 +900,18 @@ public class TurnControlTest {
 		// tablecheck
 		StoneSet newSet1, newSet2, newSet3;
 		assertEquals(3, table.getSize());
-		if (table.getSetArray()[0].size() == 2) {
+		if (table.getSetArray()[0].getSize() == 2) {
 			newSet2 = table.getSetArray()[0];
-			if (table.getSetArray()[1].size() == 4) {
+			if (table.getSetArray()[1].getSize() == 4) {
 				newSet3 = table.getSetArray()[1];
 				newSet1 = table.getSetArray()[2];
 			} else {
 				newSet3 = table.getSetArray()[2];
 				newSet1 = table.getSetArray()[1];
 			}
-		} else if (table.getSetArray()[0].size() == 4) {
+		} else if (table.getSetArray()[0].getSize() == 4) {
 			newSet3 = table.getSetArray()[0];
-			if (table.getSetArray()[1].size() == 2) {
+			if (table.getSetArray()[1].getSize() == 2) {
 				newSet2 = table.getSetArray()[1];
 				newSet1 = table.getSetArray()[2];
 			} else {
@@ -920,7 +920,7 @@ public class TurnControlTest {
 			}
 		} else {
 			newSet1 = table.getSetArray()[0];
-			if (table.getSetArray()[1].size() == 2) {
+			if (table.getSetArray()[1].getSize() == 2) {
 				newSet2 = table.getSetArray()[1];
 				newSet3 = table.getSetArray()[2];
 			} else {
@@ -930,7 +930,7 @@ public class TurnControlTest {
 		}
 
 		// setcheck1
-		assertEquals(6, newSet1.size());
+		assertEquals(6, newSet1.getSize());
 		assertSame(newSet1.get(0), blueOne);
 		assertSame(newSet1.get(1), blackOne);
 		assertSame(newSet1.get(2), redTwo);
@@ -938,11 +938,11 @@ public class TurnControlTest {
 		assertSame(newSet1.get(4), blackTwo);
 		assertSame(newSet1.get(5), blackThree);
 		// setcheck2
-		assertEquals(2, newSet2.size());
+		assertEquals(2, newSet2.getSize());
 		assertSame(newSet2.get(0), blackFour);
 		assertSame(newSet2.get(1), blackFive);
 		// setcheck1
-		assertEquals(4, newSet3.size());
+		assertEquals(4, newSet3.getSize());
 		assertSame(newSet3.get(0), blueThree);
 		assertSame(newSet3.get(1), redOne);
 		assertSame(newSet3.get(2), redThree);
diff --git a/test/jrummikub/model/StoneSetTest.java b/test/jrummikub/model/StoneSetTest.java
index d944369..fda4c6c 100644
--- a/test/jrummikub/model/StoneSetTest.java
+++ b/test/jrummikub/model/StoneSetTest.java
@@ -272,8 +272,8 @@ public class StoneSetTest {
 		StoneSet testSet = createTestSet();
 		Pair<StoneSet, StoneSet> newSets = testSet.splitAt(1);
 		// Sets have right size
-		assertEquals(1, newSets.getFirst().size());
-		assertEquals(2, newSets.getSecond().size());
+		assertEquals(1, newSets.getFirst().getSize());
+		assertEquals(2, newSets.getSecond().getSize());
 		// Set have right Stones
 		assertSame(testSet.get(0), newSets.getFirst().get(0));
 		assertSame(testSet.get(1), newSets.getSecond().get(0));
@@ -297,7 +297,7 @@ public class StoneSetTest {
 		StoneSet secondSet = new StoneSet(new Stone(2, BLUE));
 		StoneSet joinedSet = testSet.join(secondSet);
 		// Sets have right size
-		assertEquals(4, joinedSet.size());
+		assertEquals(4, joinedSet.getSize());
 		// Set have right Stones
 		assertSame(testSet.get(0), joinedSet.get(0));
 		assertSame(testSet.get(1), joinedSet.get(1));
@@ -317,7 +317,7 @@ public class StoneSetTest {
 			i++;
 		}
 
-		assertEquals(i, testSet.size());
+		assertEquals(i, testSet.getSize());
 	}
 
 	/**