From 09545d86a7b207beee54aeedd74a5c1fd0bd19a9 Mon Sep 17 00:00:00 2001 From: lotodore Date: Fri, 21 Sep 2012 23:53:25 +0200 Subject: [PATCH] Still fixing tests. --- tests/src/de/pokerth/test/SeatStateTest.java | 12 ++-- .../de/pokerth/test/StartNormalGameTest.java | 70 +++++++++++-------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/tests/src/de/pokerth/test/SeatStateTest.java b/tests/src/de/pokerth/test/SeatStateTest.java index 9968c66e..100e9abb 100644 --- a/tests/src/de/pokerth/test/SeatStateTest.java +++ b/tests/src/de/pokerth/test/SeatStateTest.java @@ -28,6 +28,11 @@ import java.util.Iterator; import org.junit.Test; +import de.pokerth.protocol.ProtoBuf.NetGameInfo; +import de.pokerth.protocol.ProtoBuf.NetGameInfo.EndRaiseMode; +import de.pokerth.protocol.ProtoBuf.NetGameInfo.NetGameType; +import de.pokerth.protocol.ProtoBuf.PokerTHMessage; + public class SeatStateTest extends TestBase { @@ -35,14 +40,11 @@ public class SeatStateTest extends TestBase { public void testSeatState() throws Exception { long firstPlayerId = userInit(); - Collection l = new ArrayList(); + Collection l = new ArrayList(); String gameName = AuthUser + " run normal game for seatState"; - NetGameInfo gameInfo = createGameInfo(5, EndRaiseModeEnumType.EnumType.doubleBlinds, 0, 200, gameName, l, 10, 0, 2, 10000); + NetGameInfo gameInfo = createGameInfo(NetGameType.normalGame, 5, 7, 5, EndRaiseMode.doubleBlinds, 0, 200, gameName, l, 10, 0, 2, 10000); sendMessage(createGameRequestMsg( gameInfo, - NetGameTypeEnumType.EnumType.normalGame, - 5, - 7, "", false)); diff --git a/tests/src/de/pokerth/test/StartNormalGameTest.java b/tests/src/de/pokerth/test/StartNormalGameTest.java index b8a489a1..f54b5f39 100644 --- a/tests/src/de/pokerth/test/StartNormalGameTest.java +++ b/tests/src/de/pokerth/test/StartNormalGameTest.java @@ -24,66 +24,80 @@ import java.util.Collection; import org.junit.Test; +import de.pokerth.protocol.ProtoBuf.NetGameInfo; +import de.pokerth.protocol.ProtoBuf.NetGameInfo.EndRaiseMode; +import de.pokerth.protocol.ProtoBuf.NetGameInfo.NetGameType; +import de.pokerth.protocol.ProtoBuf.PokerTHMessage.PokerTHMessageType; +import de.pokerth.protocol.ProtoBuf.PokerTHMessage; +import de.pokerth.protocol.ProtoBuf.StartEventAckMessage; +import de.pokerth.protocol.ProtoBuf.StartEventMessage; +import de.pokerth.protocol.ProtoBuf.StartEventMessage.StartEventType; + public class StartNormalGameTest extends TestBase { @Test public void testGameStartMessage() throws Exception { guestInit(); - Collection l = new ArrayList(); - NetGameInfo gameInfo = createGameInfo(10, EndRaiseModeEnumType.EnumType.doubleBlinds, 0, 100, GuestUser + " start normal game", l, 10, 0, 11, 20000); + Collection l = new ArrayList(); + NetGameInfo gameInfo = createGameInfo(NetGameType.normalGame, 10, 7, 10, EndRaiseMode.doubleBlinds, 0, 100, GuestUser + " start normal game", l, 10, 0, 11, 20000); sendMessage(createGameRequestMsg( gameInfo, - NetGameTypeEnumType.EnumType.normalGame, - 10, - 7, "", false)); PokerTHMessage msg; // Waiting for player list update. msg = receiveMessage(); - if (!msg.isPlayerListMessageSelected()) { + if (!msg.hasPlayerListMessage()) { failOnErrorMessage(msg); fail("Invalid message."); } msg = receiveMessage(); - if (!msg.isGameListMessageSelected()) { + if (!msg.hasGameListNewMessage()) { failOnErrorMessage(msg); fail("Invalid message."); } msg = receiveMessage(); - if (msg.isJoinGameReplyMessageSelected()) { - if (!msg.getJoinGameReplyMessage().getValue().getJoinGameResult().isJoinGameAckSelected()) { - fail("Could not create game!"); - } - } - else { + if (!msg.hasJoinGameAckMessage()) { failOnErrorMessage(msg); - fail("Invalid message."); + fail("Could not create game!"); } - long gameId = msg.getJoinGameReplyMessage().getValue().getGameId().getValue(); + int gameId = msg.getJoinGameAckMessage().getGameId(); - StartEvent startEvent = new StartEvent(); - startEvent.setFillWithComputerPlayers(true); - StartEventTypeChoiceType eventType = new StartEventTypeChoiceType(); - eventType.selectStartEvent(startEvent); - StartEventMessageSequenceType gameStartType = new StartEventMessageSequenceType(); - gameStartType.setGameId(new NonZeroId(gameId)); - gameStartType.setStartEventType(eventType); - StartEventMessage startMsg = new StartEventMessage(); - startMsg.setValue(gameStartType); - msg = new PokerTHMessage(); - msg.selectStartEventMessage(startMsg); + StartEventMessage startMsg = StartEventMessage.newBuilder() + .setGameId(gameId) + .setFillWithComputerPlayers(true) + .setStartEventType(StartEventType.startEvent) + .build(); + msg = PokerTHMessage.newBuilder() + .setMessageType(PokerTHMessageType.Type_StartEventMessage) + .setStartEventMessage(startMsg) + .build(); sendMessage(msg); do { msg = receiveMessage(); - } while (msg.isGameListMessageSelected()); + } while (msg.hasGameListPlayerJoinedMessage() || msg.hasGamePlayerJoinedMessage()); - if (msg.isGameStartMessageSelected()) { + assertTrue(msg.hasStartEventMessage() && msg.getMessageType() == PokerTHMessageType.Type_StartEventMessage); + + StartEventAckMessage startAck = StartEventAckMessage.newBuilder() + .setGameId(gameId) + .build(); + msg = PokerTHMessage.newBuilder() + .setMessageType(PokerTHMessageType.Type_StartEventAckMessage) + .setStartEventAckMessage(startAck) + .build(); + sendMessage(msg); + + do { + msg = receiveMessage(); + } while (msg.hasGameListUpdateMessage()); + + if (!msg.hasGameStartInitialMessage()) { failOnErrorMessage(msg); fail("Invalid message."); }