summaryrefslogtreecommitdiffstats
path: root/test/jrummikub/control/network/NetworkRoundControlTest.java
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-20 06:41:15 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-20 06:41:15 +0200
commit0c3eb9a28363ae697f984d9413eb187bfe2511a9 (patch)
treee72cc28d72bd27c0dad9372d3b51274af9ffdeed /test/jrummikub/control/network/NetworkRoundControlTest.java
parent74d8205f30732a8afd6aa45f859188b0a3d447e5 (diff)
downloadJRummikub-0c3eb9a28363ae697f984d9413eb187bfe2511a9.tar
JRummikub-0c3eb9a28363ae697f984d9413eb187bfe2511a9.zip
Fixed a bunch of network synchronization bugs
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@510 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'test/jrummikub/control/network/NetworkRoundControlTest.java')
-rw-r--r--test/jrummikub/control/network/NetworkRoundControlTest.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/test/jrummikub/control/network/NetworkRoundControlTest.java b/test/jrummikub/control/network/NetworkRoundControlTest.java
index 82f4dc7..24360c6 100644
--- a/test/jrummikub/control/network/NetworkRoundControlTest.java
+++ b/test/jrummikub/control/network/NetworkRoundControlTest.java
@@ -103,7 +103,8 @@ public class NetworkRoundControlTest {
connectionControl.turnStartEvent.emit(testRoundState);
assertFalse(connectionControl.turnEnded);
- connectionControl.turnEndEvent.emit(testRoundState.getTable());
+ connectionControl.turnEndEvent.emit(testRoundState.getActivePlayer()
+ .getHand(), testRoundState.getTable(), testRoundState.getTable());
assertSame(testRoundState.getNthPlayer(3), testRoundState.getActivePlayer());
assertFalse(connectionControl.turnStarted);
@@ -111,7 +112,8 @@ public class NetworkRoundControlTest {
connectionControl.turnStartEvent.emit(testRoundState);
assertFalse(connectionControl.turnEnded);
- connectionControl.turnEndEvent.emit(testRoundState.getTable());
+ connectionControl.turnEndEvent.emit(testRoundState.getActivePlayer()
+ .getHand(), testRoundState.getTable(), testRoundState.getTable());
assertSame(testRoundState.getNthPlayer(0), testRoundState.getActivePlayer());
assertFalse(connectionControl.turnStarted);
@@ -144,7 +146,8 @@ public class NetworkRoundControlTest {
connectionControl.turnStartEvent.emit(testRoundState);
assertFalse(connectionControl.turnEnded);
- connectionControl.turnEndEvent.emit(testRoundState.getTable());
+ connectionControl.turnEndEvent.emit(testRoundState.getActivePlayer()
+ .getHand(), testRoundState.getTable(), testRoundState.getTable());
assertSame(testRoundState.getNthPlayer(1), testRoundState.getActivePlayer());
assertFalse(connectionControl.turnStarted);
@@ -152,7 +155,8 @@ public class NetworkRoundControlTest {
connectionControl.turnStartEvent.emit(testRoundState);
assertFalse(connectionControl.turnEnded);
- connectionControl.turnEndEvent.emit(testRoundState.getTable());
+ connectionControl.turnEndEvent.emit(testRoundState.getActivePlayer()
+ .getHand(), testRoundState.getTable(), testRoundState.getTable());
assertSame(testRoundState.getNthPlayer(2), testRoundState.getActivePlayer());
assertFalse(connectionControl.turnStarted);