sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing additional java tests.

Browse Source
This commit is contained in:
lotodore
2015-01-18 12:07:39 +01:00
parent 046a2fbdc3
commit 19bf312694
7 changed files with 154 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/de/pokerth/test/ChatTest.java
+7 -7
View File
@@ -208,7 +208,7 @@ public class ChatTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
// Acknowledge start event. // Acknowledge start event.
StartEventAckMessage startAck = StartEventAckMessage.newBuilder() StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
@@ -236,7 +236,7 @@ public class ChatTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage());
// Guest user: not allowed. // Guest user: not allowed.
msg = createGameChatMsg(ChatText + 7, gameId); msg = createGameChatMsg(ChatText + 7, gameId);
@@ -245,7 +245,7 @@ public class ChatTest extends TestBase {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage()); assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage());
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage());
assertEquals(ChatText + 7, msg.getGameMessage().getGameManagementMessage().getChatRejectMessage().getChatText()); assertEquals(ChatText + 7, msg.getGameMessage().getGameManagementMessage().getChatRejectMessage().getChatText());
// Other users: allowed. // Other users: allowed.
@@ -256,7 +256,7 @@ public class ChatTest extends TestBase {
msg = receiveMessage(s[c]); msg = receiveMessage(s[c]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage()); assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage());
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasChatMessage());
assertEquals(ChatText + "c" + c, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatText()); assertEquals(ChatText + "c" + c, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatText());
assertEquals(ChatType.chatTypeStandard, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatType()); assertEquals(ChatType.chatTypeStandard, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatType());
@@ -269,7 +269,7 @@ public class ChatTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage()); assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatRejectMessage());
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasChatMessage());
assertEquals(ChatText + "c" + c, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatText()); assertEquals(ChatText + "c" + c, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatText());
assertEquals(ChatType.chatTypeStandard, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatType()); assertEquals(ChatType.chatTypeStandard, msg.getGameMessage().getGameManagementMessage().getChatMessage().getChatType());
assertEquals(playerId[c], msg.getGameMessage().getGameManagementMessage().getChatMessage().getPlayerId()); assertEquals(playerId[c], msg.getGameMessage().getGameManagementMessage().getChatMessage().getPlayerId());
@@ -285,7 +285,7 @@ public class ChatTest extends TestBase {
msg = receiveMessage(s[0]); msg = receiveMessage(s[0]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage()); assertFalse(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasChatMessage());
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasChatRejectMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasChatRejectMessage());
// Leave the game. // Leave the game.
msg = leaveGameRequestMsg(gameId); msg = leaveGameRequestMsg(gameId);
@@ -293,7 +293,7 @@ public class ChatTest extends TestBase {
do { do {
msg = receiveMessage(s[0]); msg = receiveMessage(s[0]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasRemovedFromGameMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasRemovedFromGameMessage());
// A game chat message, if not within a game, should be rejected with error. // A game chat message, if not within a game, should be rejected with error.
msg = createGameChatMsg(ChatText + 9, gameId); msg = createGameChatMsg(ChatText + 9, gameId);
sendMessage(msg, s[0]); sendMessage(msg, s[0]);
tests/src/de/pokerth/test/GameListTest.java
+3 -3
View File
@@ -162,7 +162,7 @@ public class GameListTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage());
assertEquals(NetGameMode.netGameStarted, msg.getLobbyMessage().getGameListUpdateMessage().getGameMode()); assertEquals(NetGameMode.netGameStarted, msg.getLobbyMessage().getGameListUpdateMessage().getGameMode());
@@ -172,7 +172,7 @@ public class GameListTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerLeftMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerLeftMessage());
GameListPlayerLeftMessage gameListLeftMsg = msg.getLobbyMessage().getGameListPlayerLeftMessage(); GameListPlayerLeftMessage gameListLeftMsg = msg.getLobbyMessage().getGameListPlayerLeftMessage();
assertEquals(gameId, gameListLeftMsg.getGameId()); assertEquals(gameId, gameListLeftMsg.getGameId());
assertEquals(playerId[i], gameListLeftMsg.getPlayerId()); assertEquals(playerId[i], gameListLeftMsg.getPlayerId());
@@ -182,7 +182,7 @@ public class GameListTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage());
assertEquals(NetGameMode.netGameClosed, msg.getLobbyMessage().getGameListUpdateMessage().getGameMode()); assertEquals(NetGameMode.netGameClosed, msg.getLobbyMessage().getGameListUpdateMessage().getGameMode());
} }
tests/src/de/pokerth/test/LoadTest.java
+4 -4
View File
@@ -67,7 +67,7 @@ public class LoadTest extends TestBase {
msg = receiveMessage(s[i * 10]); msg = receiveMessage(s[i * 10]);
} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) } while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())); || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -88,7 +88,7 @@ public class LoadTest extends TestBase {
} while (msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage() || msg.getLobbyMessage().hasPlayerListMessage())); } while (msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage() || msg.getLobbyMessage().hasPlayerListMessage()));
// Join game ack. // Join game ack.
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Could not create game!"); fail("Could not create game!");
} }
@@ -110,7 +110,7 @@ public class LoadTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
} while ((msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) } while ((msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())
|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())); || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -119,7 +119,7 @@ public class LoadTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage()) && !(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameFailedMessage())); } while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage()) && !(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameFailedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
fail("User " + username + " could not join normal game."); fail("User " + username + " could not join normal game.");
} }
} }
tests/src/de/pokerth/test/LobbySubscriptionTest.java
+2 -2
View File
@@ -45,7 +45,7 @@ public class LobbySubscriptionTest extends TestBase {
final int requestId = 1234; final int requestId = 1234;
PokerTHMessage msg; PokerTHMessage msg;
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -99,7 +99,7 @@ public class LobbySubscriptionTest extends TestBase {
if (msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasPlayerListMessage())) { if (msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasPlayerListMessage())) {
fail("Game/player list messages are switched off!"); fail("Game/player list messages are switched off!");
} }
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
// Resubscribe game list // Resubscribe game list
subscriptionRequest = SubscriptionRequestMessage.newBuilder() subscriptionRequest = SubscriptionRequestMessage.newBuilder()
tests/src/de/pokerth/test/RejoinGameTest.java
+23 -23
View File
@@ -51,7 +51,7 @@ public class RejoinGameTest extends TestBase {
// Waiting for player list update. // Waiting for player list update.
PokerTHMessage msg; PokerTHMessage msg;
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -66,14 +66,14 @@ public class RejoinGameTest extends TestBase {
// Game list update (new game) // Game list update (new game)
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListNewMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListNewMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
// Join game ack. // Join game ack.
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || msg.getLobbyMessage().hasJoinGameAckMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Could not create game!"); fail("Could not create game!");
} }
@@ -81,7 +81,7 @@ public class RejoinGameTest extends TestBase {
// Game list update (player joined). // Game list update (player joined).
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) { if (!msg.hasLobbyMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -99,7 +99,7 @@ public class RejoinGameTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) } while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())); || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -108,23 +108,23 @@ public class RejoinGameTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage()))); } while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
fail("User " + username + " could not join ranking game."); fail("User " + username + " could not join ranking game.");
} }
// The player should have joined the game. // The player should have joined the game.
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -132,7 +132,7 @@ public class RejoinGameTest extends TestBase {
// Server should automatically send start event. // Server should automatically send start event.
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -140,7 +140,7 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
} }
// Acknowledge start event. // Acknowledge start event.
StartEventAckMessage startAck = StartEventAckMessage.newBuilder() StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
@@ -169,13 +169,13 @@ public class RejoinGameTest extends TestBase {
// Game list update (game now running). // Game list update (game now running).
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage())) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -190,7 +190,7 @@ public class RejoinGameTest extends TestBase {
failOnErrorMessage(inMsg); failOnErrorMessage(inMsg);
} }
} }
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
// Leave the game by closing the socket. // Leave the game by closing the socket.
sock.close(); sock.close();
@@ -202,7 +202,7 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
assertEquals(firstPlayerId, msg.getLobbyMessage().getPlayerListMessage().getPlayerId()); assertEquals(firstPlayerId, msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
assertEquals(PlayerListNotification.playerListLeft, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification()); assertEquals(PlayerListNotification.playerListLeft, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
} }
@@ -216,7 +216,7 @@ public class RejoinGameTest extends TestBase {
msg = receiveMessage(); msg = receiveMessage();
} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) } while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())); || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -226,7 +226,7 @@ public class RejoinGameTest extends TestBase {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage()))); } while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
fail("User " + AuthUser + " could not rejoin normal game."); fail("User " + AuthUser + " could not rejoin normal game.");
} }
@@ -235,7 +235,7 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
assertEquals(firstPlayerIdAfterRejoin, msg.getLobbyMessage().getPlayerListMessage().getPlayerId()); assertEquals(firstPlayerIdAfterRejoin, msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
assertEquals(PlayerListNotification.playerListNew, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification()); assertEquals(PlayerListNotification.playerListNew, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
} }
@@ -244,7 +244,7 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
assertEquals(gameId, msg.getGameMessage().getGameId()); assertEquals(gameId, msg.getGameMessage().getGameId());
assertEquals(StartEventType.rejoinEvent, msg.getGameMessage().getGameManagementMessage().getStartEventMessage().getStartEventType()); assertEquals(StartEventType.rejoinEvent, msg.getGameMessage().getGameManagementMessage().getStartEventMessage().getStartEventType());
@@ -275,7 +275,7 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage());
// Check whether we got all necessary data to rejoin. // Check whether we got all necessary data to rejoin.
assertEquals(gameId, msg.getGameMessage().getGameId()); assertEquals(gameId, msg.getGameMessage().getGameId());
@@ -289,7 +289,7 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage());
assertEquals(firstPlayerId, msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getOldPlayerId()); assertEquals(firstPlayerId, msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getOldPlayerId());
assertEquals(firstPlayerIdAfterRejoin, msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getNewPlayerId()); assertEquals(firstPlayerIdAfterRejoin, msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getNewPlayerId());
} }
@@ -298,12 +298,12 @@ public class RejoinGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
} }
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
tests/src/de/pokerth/test/RejoinMultiGameTest.java
+24 -24
View File
@@ -57,7 +57,7 @@ public class RejoinMultiGameTest extends TestBase {
// Waiting for player list update. // Waiting for player list update.
PokerTHMessage msg; PokerTHMessage msg;
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -72,14 +72,14 @@ public class RejoinMultiGameTest extends TestBase {
// Game list update (new game) // Game list update (new game)
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListNewMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListNewMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
// Join game ack. // Join game ack.
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Could not create game!"); fail("Could not create game!");
} }
@@ -87,7 +87,7 @@ public class RejoinMultiGameTest extends TestBase {
// Game list update (player joined). // Game list update (player joined).
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -107,7 +107,7 @@ public class RejoinMultiGameTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) } while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())); || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -116,23 +116,23 @@ public class RejoinMultiGameTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage()))); } while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
fail("User " + username + " could not join ranking game."); fail("User " + username + " could not join ranking game.");
} }
// The player should have joined the game. // The player should have joined the game.
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -140,7 +140,7 @@ public class RejoinMultiGameTest extends TestBase {
// Server should automatically send start event. // Server should automatically send start event.
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -148,7 +148,7 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
} }
// Acknowledge start event. // Acknowledge start event.
StartEventAckMessage startAck = StartEventAckMessage.newBuilder() StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
@@ -177,13 +177,13 @@ public class RejoinMultiGameTest extends TestBase {
// Game list update (game now running). // Game list update (game now running).
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListUpdateMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage())) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -198,7 +198,7 @@ public class RejoinMultiGameTest extends TestBase {
failOnErrorMessage(inMsg); failOnErrorMessage(inMsg);
} }
} }
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
// 9 players leave the game by closing the socket. // 9 players leave the game by closing the socket.
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
@@ -213,7 +213,7 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
assertEquals(playerId[i], msg.getLobbyMessage().getPlayerListMessage().getPlayerId()); assertEquals(playerId[i], msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
assertEquals(PlayerListNotification.playerListLeft, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification()); assertEquals(PlayerListNotification.playerListLeft, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
} }
@@ -231,7 +231,7 @@ public class RejoinMultiGameTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
} while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) } while ((msg.hasLobbyMessage() && (msg.getLobbyMessage().hasGameListNewMessage() || msg.getLobbyMessage().hasGameListPlayerJoinedMessage()))
|| (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage())); || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -240,7 +240,7 @@ public class RejoinMultiGameTest extends TestBase {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage()))); } while (!(msg.hasLobbyMessage() && (msg.getLobbyMessage().hasJoinGameAckMessage() || msg.getLobbyMessage().hasJoinGameFailedMessage())));
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasJoinGameAckMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
fail("User " + username + " could not rejoin ranking game."); fail("User " + username + " could not rejoin ranking game.");
} }
} }
@@ -249,7 +249,7 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasPlayerListMessage())); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage());
assertEquals(playerIdAfterRejoin[i], msg.getLobbyMessage().getPlayerListMessage().getPlayerId()); assertEquals(playerIdAfterRejoin[i], msg.getLobbyMessage().getPlayerListMessage().getPlayerId());
assertEquals(PlayerListNotification.playerListNew, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification()); assertEquals(PlayerListNotification.playerListNew, msg.getLobbyMessage().getPlayerListMessage().getPlayerListNotification());
} }
@@ -259,7 +259,7 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasStartEventMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
assertEquals(gameId, msg.getGameMessage().getGameId()); assertEquals(gameId, msg.getGameMessage().getGameId());
assertEquals(StartEventType.rejoinEvent, msg.getGameMessage().getGameManagementMessage().getStartEventMessage().getStartEventType()); assertEquals(StartEventType.rejoinEvent, msg.getGameMessage().getGameManagementMessage().getStartEventMessage().getStartEventType());
@@ -292,7 +292,7 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartRejoinMessage());
// Check whether we got all necessary data to rejoin. // Check whether we got all necessary data to rejoin.
assertEquals(gameId, msg.getGameMessage().getGameId()); assertEquals(gameId, msg.getGameMessage().getGameId());
@@ -307,7 +307,7 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasPlayerIdChangedMessage());
assertEquals(playerId[i], msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getOldPlayerId()); assertEquals(playerId[i], msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getOldPlayerId());
assertEquals(playerIdAfterRejoin[i], msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getNewPlayerId()); assertEquals(playerIdAfterRejoin[i], msg.getGameMessage().getGameManagementMessage().getPlayerIdChangedMessage().getNewPlayerId());
} }
@@ -316,19 +316,19 @@ public class RejoinMultiGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameEngineMessage() || !msg.getGameMessage().getGameEngineMessage().hasHandStartMessage());
} }
// The game should continue to the end. // The game should continue to the end.
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!(msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasEndOfGameMessage())); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasEndOfGameMessage());
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
s[i].close(); s[i].close();
tests/src/de/pokerth/test/RunRankingGameTest.java
+79 -35
View File
@@ -29,11 +29,17 @@ import java.util.Iterator;
import org.junit.Test; import org.junit.Test;
import de.pokerth.protocol.ProtoBuf.GameEngineMessage;
import de.pokerth.protocol.ProtoBuf.GameEngineMessage.GameEngineMessageType;
import de.pokerth.protocol.ProtoBuf.GameManagementMessage;
import de.pokerth.protocol.ProtoBuf.GameMessage;
import de.pokerth.protocol.ProtoBuf.MyActionRequestMessage; import de.pokerth.protocol.ProtoBuf.MyActionRequestMessage;
import de.pokerth.protocol.ProtoBuf.NetGameInfo; import de.pokerth.protocol.ProtoBuf.NetGameInfo;
import de.pokerth.protocol.ProtoBuf.NetPlayerAction; import de.pokerth.protocol.ProtoBuf.NetPlayerAction;
import de.pokerth.protocol.ProtoBuf.PlayerResult; import de.pokerth.protocol.ProtoBuf.PlayerResult;
import de.pokerth.protocol.ProtoBuf.StartEventAckMessage; import de.pokerth.protocol.ProtoBuf.StartEventAckMessage;
import de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType;
import de.pokerth.protocol.ProtoBuf.GameMessage.GameMessageType;
import de.pokerth.protocol.ProtoBuf.NetGameInfo.EndRaiseMode; import de.pokerth.protocol.ProtoBuf.NetGameInfo.EndRaiseMode;
import de.pokerth.protocol.ProtoBuf.NetGameInfo.NetGameType; import de.pokerth.protocol.ProtoBuf.NetGameInfo.NetGameType;
import de.pokerth.protocol.ProtoBuf.PokerTHMessage.PokerTHMessageType; import de.pokerth.protocol.ProtoBuf.PokerTHMessage.PokerTHMessageType;
@@ -84,7 +90,7 @@ public class RunRankingGameTest extends TestBase {
// Game list update (player joined). // Game list update (player joined).
msg = receiveMessage(); msg = receiveMessage();
if (!(msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListPlayerJoinedMessage())) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -100,8 +106,9 @@ public class RunRankingGameTest extends TestBase {
// Waiting for player list update. // Waiting for player list update.
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
} while (msg.hasGameListNewMessage() || msg.hasGamePlayerJoinedMessage()); } while ((msg.hasLobbyMessage() && msg.getLobbyMessage().hasGameListNewMessage())
if (!msg.hasPlayerListMessage()) { || (msg.hasGameMessage() && msg.getGameMessage().hasGameManagementMessage() && msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()));
if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -109,24 +116,24 @@ public class RunRankingGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!msg.hasJoinGameAckMessage() && !msg.hasJoinGameFailedMessage()); } while (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage() || !msg.getLobbyMessage().hasJoinGameFailedMessage());
if (!msg.hasJoinGameAckMessage()) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasJoinGameAckMessage()) {
fail("User " + username + " could not join ranking game."); fail("User " + username + " could not join ranking game.");
} }
// The player should have joined the game. // The player should have joined the game.
msg = receiveMessage(); msg = receiveMessage();
if (!msg.hasPlayerListMessage()) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasPlayerListMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!msg.hasGamePlayerJoinedMessage()) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGamePlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!msg.hasGameListPlayerJoinedMessage()) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListPlayerJoinedMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -134,7 +141,7 @@ public class RunRankingGameTest extends TestBase {
// Server should automatically send start event. // Server should automatically send start event.
msg = receiveMessage(); msg = receiveMessage();
if (!msg.hasStartEventMessage()) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -142,16 +149,28 @@ public class RunRankingGameTest extends TestBase {
do { do {
msg = receiveMessage(s[i]); msg = receiveMessage(s[i]);
failOnErrorMessage(msg); failOnErrorMessage(msg);
} while (!msg.hasStartEventMessage()); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasStartEventMessage());
} }
// Acknowledge start event. // Acknowledge start event.
StartEventAckMessage startAck = StartEventAckMessage.newBuilder() StartEventAckMessage startAck = StartEventAckMessage.newBuilder()
.setGameId(gameId)
.build(); .build();
msg = PokerTHMessage.newBuilder()
.setMessageType(PokerTHMessageType.Type_StartEventAckMessage) GameManagementMessage gameManagement = GameManagementMessage.newBuilder()
.setMessageType(GameManagementMessageType.Type_StartEventAckMessage)
.setStartEventAckMessage(startAck) .setStartEventAckMessage(startAck)
.build(); .build();
GameMessage game = GameMessage.newBuilder()
.setGameId(gameId)
.setMessageType(GameMessageType.Type_GameManagementMessage)
.setGameManagementMessage(gameManagement)
.build();
msg = PokerTHMessage.newBuilder()
.setMessageType(PokerTHMessageType.Type_GameMessage)
.setGameMessage(game)
.build();
sendMessage(msg); sendMessage(msg);
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
sendMessage(msg, s[i]); sendMessage(msg, s[i]);
@@ -159,13 +178,13 @@ public class RunRankingGameTest extends TestBase {
// Game list update (game now running). // Game list update (game now running).
msg = receiveMessage(); msg = receiveMessage();
if (!msg.hasGameListUpdateMessage()) { if (!msg.hasLobbyMessage() || !msg.getLobbyMessage().hasGameListUpdateMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
msg = receiveMessage(); msg = receiveMessage();
if (!msg.hasGameStartInitialMessage()) { if (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasGameStartInitialMessage()) {
failOnErrorMessage(msg); failOnErrorMessage(msg);
fail("Invalid message."); fail("Invalid message.");
} }
@@ -175,11 +194,11 @@ public class RunRankingGameTest extends TestBase {
do { do {
msg = receiveMessage(); msg = receiveMessage();
failOnErrorMessage(msg); failOnErrorMessage(msg);
if (msg.hasHandStartMessage()) { if (msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasHandStartMessage()) {
handNum++; handNum++;
// Cards should be encrypted for registered users. // Cards should be encrypted for registered users.
assertTrue(msg.getHandStartMessage().hasEncryptedCards()); assertTrue(msg.getGameMessage().getGameEngineMessage().getHandStartMessage().hasEncryptedCards());
byte[] encData = msg.getHandStartMessage().getEncryptedCards().toByteArray(); byte[] encData = msg.getGameMessage().getGameEngineMessage().getHandStartMessage().getEncryptedCards().toByteArray();
byte[] cardData = decryptCards(AuthPassword, encData); byte[] cardData = decryptCards(AuthPassword, encData);
int size = cardData.length; int size = cardData.length;
while (size > 0 && cardData[size-1] == 0) { while (size > 0 && cardData[size-1] == 0) {
@@ -201,19 +220,32 @@ public class RunRankingGameTest extends TestBase {
assertTrue(card2 < 52); assertTrue(card2 < 52);
assertTrue(card2 >= 0); assertTrue(card2 >= 0);
} }
else if (msg.hasPlayersTurnMessage()) { else if (msg.hasGameMessage() && msg.getGameMessage().hasGameEngineMessage() && msg.getGameMessage().getGameEngineMessage().hasPlayersTurnMessage()) {
if (msg.getPlayersTurnMessage().getPlayerId() == firstPlayerId) { if (msg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getPlayerId() == firstPlayerId) {
MyActionRequestMessage myRequest = MyActionRequestMessage.newBuilder() MyActionRequestMessage myRequest = MyActionRequestMessage.newBuilder()
.setGameId(gameId) .setGameState(msg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getGameState())
.setGameState(msg.getPlayersTurnMessage().getGameState())
.setHandNum(handNum) .setHandNum(handNum)
.setMyAction(NetPlayerAction.netActionAllIn) .setMyAction(NetPlayerAction.netActionAllIn)
.setMyRelativeBet(0) .setMyRelativeBet(0)
.build(); .build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
.setMessageType(PokerTHMessageType.Type_MyActionRequestMessage) GameEngineMessage gameEngine = GameEngineMessage.newBuilder()
.setMessageType(GameEngineMessageType.Type_MyActionRequestMessage)
.setMyActionRequestMessage(myRequest) .setMyActionRequestMessage(myRequest)
.build(); .build();
game = GameMessage.newBuilder()
.setGameId(gameId)
.setMessageType(GameMessageType.Type_GameEngineMessage)
.setGameEngineMessage(gameEngine)
.build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
.setMessageType(PokerTHMessageType.Type_GameMessage)
.setGameMessage(game)
.build();
sendMessage(outMsg); sendMessage(outMsg);
} }
} }
@@ -221,27 +253,39 @@ public class RunRankingGameTest extends TestBase {
while (s[i].getInputStream().available() > 0) { while (s[i].getInputStream().available() > 0) {
PokerTHMessage inMsg = receiveMessage(s[i]); PokerTHMessage inMsg = receiveMessage(s[i]);
failOnErrorMessage(inMsg); failOnErrorMessage(inMsg);
if (inMsg.hasPlayersTurnMessage()) { if (inMsg.hasGameMessage() && inMsg.getGameMessage().hasGameEngineMessage() && inMsg.getGameMessage().getGameEngineMessage().hasPlayersTurnMessage()) {
if (inMsg.getPlayersTurnMessage().getPlayerId() == playerId[i]) { if (inMsg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getPlayerId() == playerId[i]) {
MyActionRequestMessage myRequest = MyActionRequestMessage.newBuilder() MyActionRequestMessage myRequest = MyActionRequestMessage.newBuilder()
.setGameId(gameId) .setGameState(msg.getGameMessage().getGameEngineMessage().getPlayersTurnMessage().getGameState())
.setGameState(inMsg.getPlayersTurnMessage().getGameState())
.setHandNum(handNum) .setHandNum(handNum)
.setMyAction(NetPlayerAction.netActionFold) .setMyAction(NetPlayerAction.netActionFold)
.setMyRelativeBet(0) .setMyRelativeBet(0)
.build(); .build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
.setMessageType(PokerTHMessageType.Type_MyActionRequestMessage) GameEngineMessage gameEngine = GameEngineMessage.newBuilder()
.setMessageType(GameEngineMessageType.Type_MyActionRequestMessage)
.setMyActionRequestMessage(myRequest) .setMyActionRequestMessage(myRequest)
.build(); .build();
game = GameMessage.newBuilder()
.setGameId(gameId)
.setMessageType(GameMessageType.Type_GameEngineMessage)
.setGameEngineMessage(gameEngine)
.build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
.setMessageType(PokerTHMessageType.Type_GameMessage)
.setGameMessage(game)
.build();
sendMessage(outMsg, s[i]); sendMessage(outMsg, s[i]);
} }
} }
else if (inMsg.hasEndOfHandHideCardsMessage()) { else if (inMsg.hasGameMessage() && inMsg.getGameMessage().hasGameEngineMessage() && inMsg.getGameMessage().getGameEngineMessage().hasEndOfHandHideCardsMessage()) {
lastPlayerMoney = inMsg.getEndOfHandHideCardsMessage().getPlayerMoney(); lastPlayerMoney = inMsg.getGameMessage().getGameEngineMessage().getEndOfHandHideCardsMessage().getPlayerMoney();
} else if (inMsg.hasEndOfHandShowCardsMessage()) { } else if (inMsg.hasGameMessage() && inMsg.getGameMessage().hasGameEngineMessage() && inMsg.getGameMessage().getGameEngineMessage().hasEndOfHandShowCardsMessage()) {
Collection<PlayerResult> result = inMsg.getEndOfHandShowCardsMessage().getPlayerResultsList(); Collection<PlayerResult> result = inMsg.getGameMessage().getGameEngineMessage().getEndOfHandShowCardsMessage().getPlayerResultsList();
assertFalse(result.isEmpty()); assertFalse(result.isEmpty());
int maxPlayerMoney = 0; int maxPlayerMoney = 0;
for (Iterator<PlayerResult> it = result.iterator(); it.hasNext(); ) { for (Iterator<PlayerResult> it = result.iterator(); it.hasNext(); ) {
@@ -255,7 +299,7 @@ public class RunRankingGameTest extends TestBase {
} }
} }
} }
} while (!msg.hasEndOfGameMessage()); } while (!msg.hasGameMessage() || !msg.getGameMessage().hasGameManagementMessage() || !msg.getGameMessage().getGameManagementMessage().hasEndOfGameMessage());
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
s[i].close(); s[i].close();