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

Some work on protocol buffer details.

Browse Source
This commit is contained in:
lotodore
2012-09-23 23:19:53 +02:00
parent e16d4908bd
commit f0ee0af6ec
13 changed files with 1103 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/de/pokerth/protocol/ProtoBuf.java
+596 -593
View File
File diff suppressed because it is too large Load Diff
tests/src/de/pokerth/test/GameListTest.java
+5 -5
View File
@@ -41,7 +41,7 @@ import de.pokerth.protocol.ProtoBuf.PokerTHMessage;
public class GameListTest extends TestBase {
protected void checkGameListNewMsg(int myId, GameListNewMessage gameListNew, NetGameMode mode, NetGameInfo gameInfo) {
assertEquals(NetGameMode.gameCreated, gameListNew.getGameMode());
assertEquals(NetGameMode.netGameCreated, gameListNew.getGameMode());
assertTrue(!gameListNew.getIsPrivate());
assertEquals(myId, gameListNew.getAdminPlayerId());
NetGameInfo receivedGameInfo = gameListNew.getGameInfo();
@@ -86,7 +86,7 @@ public class GameListTest extends TestBase {
checkGameListNewMsg(
myId,
gameListNewMsg,
NetGameMode.gameCreated,
NetGameMode.netGameCreated,
gameInfo);
assertTrue(gameListNewMsg.getPlayerIdsCount() == 0);
@@ -124,7 +124,7 @@ public class GameListTest extends TestBase {
checkGameListNewMsg(
myId,
gameListNewMsg,
NetGameMode.gameCreated,
NetGameMode.netGameCreated,
gameInfo);
assertEquals(1, gameListNewMsg.getPlayerIdsCount());
assertEquals(myId, gameListNewMsg.getPlayerIds(0));
@@ -165,7 +165,7 @@ public class GameListTest extends TestBase {
failOnErrorMessage(msg);
} while (!(msg.hasGameListUpdateMessage()));
assertEquals(NetGameMode.gameStarted, msg.getGameListUpdateMessage().getGameMode());
assertEquals(NetGameMode.netGameStarted, msg.getGameListUpdateMessage().getGameMode());
// Wait for player left messages.
for (int i = 0; i < 9; i++) {
@@ -185,6 +185,6 @@ public class GameListTest extends TestBase {
failOnErrorMessage(msg);
} while (!(msg.hasGameListUpdateMessage()));
assertEquals(NetGameMode.gameClosed, msg.getGameListUpdateMessage().getGameMode());
assertEquals(NetGameMode.netGameClosed, msg.getGameListUpdateMessage().getGameMode());
}
}
tests/src/de/pokerth/test/LoadTest.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class LoadTest extends TestBase {
.setGameId(gameId[i / 10])
.setGameState(msg.getPlayersTurnMessage().getGameState())
.setHandNum(handNum[i / 10])
.setMyAction(NetPlayerAction.actionAllIn)
.setMyAction(NetPlayerAction.netActionAllIn)
.setMyRelativeBet(0)
.build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
tests/src/de/pokerth/test/PlayerInfoTest.java
+4 -4
View File
@@ -26,10 +26,10 @@ import java.util.Arrays;
import org.junit.Test;
import de.pokerth.protocol.ProtoBuf.NetAvatarType;
import de.pokerth.protocol.ProtoBuf.NetPlayerInfoRights;
import de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage;
import de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.PlayerInfoData;
import de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage;
import de.pokerth.protocol.ProtoBuf.PlayerInfoRights;
import de.pokerth.protocol.ProtoBuf.PokerTHMessage;
import de.pokerth.protocol.ProtoBuf.PokerTHMessage.PokerTHMessageType;
@@ -93,7 +93,7 @@ public class PlayerInfoTest extends TestBase {
assertEquals(GuestUser, info.getPlayerName());
assertFalse(info.hasCountryCode());
assertTrue(info.getIsHuman());
assertEquals(PlayerInfoRights.playerRightsGuest, info.getPlayerRights());
assertEquals(NetPlayerInfoRights.netPlayerRightsGuest, info.getPlayerRights());
assertFalse(info.hasAvatarData());
}
// Request other players' info.
@@ -110,14 +110,14 @@ public class PlayerInfoTest extends TestBase {
assertEquals("test" + (i+1), info.getPlayerName());
assertFalse(info.hasCountryCode());
assertTrue(info.getIsHuman());
assertEquals(PlayerInfoRights.playerRightsNormal, info.getPlayerRights());
assertEquals(NetPlayerInfoRights.netPlayerRightsNormal, info.getPlayerRights());
// Every second player has an avatar, see above.
if (i % 2 == 0) {
assertFalse(info.hasAvatarData());
} else {
assertTrue(info.hasAvatarData());
assertTrue(Arrays.equals(info.getAvatarData().getAvatarHash().toByteArray(), avatarHash));
assertEquals(NetAvatarType.avatarImagePng, info.getAvatarData().getAvatarType());
assertEquals(NetAvatarType.netAvatarImagePng, info.getAvatarData().getAvatarType());
}
}
// Request invalid player info.
tests/src/de/pokerth/test/RunRankingGameTest.java
+2 -2
View File
@@ -207,7 +207,7 @@ public class RunRankingGameTest extends TestBase {
.setGameId(gameId)
.setGameState(msg.getPlayersTurnMessage().getGameState())
.setHandNum(handNum)
.setMyAction(NetPlayerAction.actionAllIn)
.setMyAction(NetPlayerAction.netActionAllIn)
.setMyRelativeBet(0)
.build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
@@ -228,7 +228,7 @@ public class RunRankingGameTest extends TestBase {
.setGameId(gameId)
.setGameState(inMsg.getPlayersTurnMessage().getGameState())
.setHandNum(handNum)
.setMyAction(NetPlayerAction.actionFold)
.setMyAction(NetPlayerAction.netActionFold)
.setMyRelativeBet(0)
.build();
PokerTHMessage outMsg = PokerTHMessage.newBuilder()
tests/src/de/pokerth/test/SeatStateTest.java
+4 -4
View File
@@ -131,7 +131,7 @@ public class SeatStateTest extends TestBase {
assertEquals(10, seatStates.size());
for (Iterator<NetPlayerState> it = seatStates.iterator(); it.hasNext(); ) {
NetPlayerState state = it.next();
assertEquals(NetPlayerState.playerStateNormal, state);
assertEquals(NetPlayerState.netPlayerStateNormal, state);
}
// All other players leave (and are in autofold state then).
for (int i = 0; i < 9; i++) {
@@ -152,12 +152,12 @@ public class SeatStateTest extends TestBase {
int seatPos = 0;
for (Iterator<NetPlayerState> it = seatStates.iterator(); it.hasNext(); ) {
NetPlayerState state = it.next();
assertTrue(NetPlayerState.playerStateNoMoney != state);
if (NetPlayerState.playerStateNormal == state) {
assertTrue(NetPlayerState.netPlayerStateNoMoney != state);
if (NetPlayerState.netPlayerStateNormal == state) {
assertEquals(firstPlayerPos, seatPos);
stateNormalCounter++;
}
if (NetPlayerState.playerStateSessionInactive == state) {
if (NetPlayerState.netPlayerStateSessionInactive == state) {
stateInactiveCounter++;
}
seatPos++;