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

Polishing test cases.

Browse Source
This commit is contained in:
lotodore
2011-02-13 17:26:17 +00:00
parent dafd78c578
commit 89c613ab85
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/pokerth_test/PlayerInfoTest.java
+9 -9
View File
@@ -84,11 +84,11 @@ public class PlayerInfoTest extends TestBase {
assertTrue(reply.getValue().getPlayerId().getValue() == firstPlayerId); assertTrue(reply.getValue().getPlayerId().getValue() == firstPlayerId);
assertTrue(reply.getValue().getPlayerInfoResult().isPlayerInfoDataSelected()); assertTrue(reply.getValue().getPlayerInfoResult().isPlayerInfoDataSelected());
PlayerInfoData info = reply.getValue().getPlayerInfoResult().getPlayerInfoData(); PlayerInfoData info = reply.getValue().getPlayerInfoResult().getPlayerInfoData();
assertEquals(info.getPlayerName(), GuestUser); assertEquals(GuestUser, info.getPlayerName());
assertEquals(info.getCountryCode(), null); assertEquals(null, info.getCountryCode());
assertTrue(info.getIsHuman()); assertTrue(info.getIsHuman());
assertEquals(info.getPlayerRights().getValue(), PlayerInfoRights.EnumType.playerRightsGuest); assertEquals(PlayerInfoRights.EnumType.playerRightsGuest, info.getPlayerRights().getValue());
assertEquals(info.getAvatarData(), null); assertEquals(null, info.getAvatarData());
} }
// Request other players' info. // Request other players' info.
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
@@ -101,16 +101,16 @@ public class PlayerInfoTest extends TestBase {
assertTrue(reply.getValue().getPlayerId().getValue() == playerId[i]); assertTrue(reply.getValue().getPlayerId().getValue() == playerId[i]);
assertTrue(reply.getValue().getPlayerInfoResult().isPlayerInfoDataSelected()); assertTrue(reply.getValue().getPlayerInfoResult().isPlayerInfoDataSelected());
PlayerInfoData info = reply.getValue().getPlayerInfoResult().getPlayerInfoData(); PlayerInfoData info = reply.getValue().getPlayerInfoResult().getPlayerInfoData();
assertEquals(info.getPlayerName(), "test" + (i+1)); assertEquals("test" + (i+1), info.getPlayerName());
assertEquals(info.getCountryCode(), null); assertEquals(null, info.getCountryCode());
assertTrue(info.getIsHuman()); assertTrue(info.getIsHuman());
assertEquals(info.getPlayerRights().getValue(), PlayerInfoRights.EnumType.playerRightsNormal); assertEquals(PlayerInfoRights.EnumType.playerRightsNormal, info.getPlayerRights().getValue());
// Every second player has an avatar, see above. // Every second player has an avatar, see above.
if (i % 2 == 0) { if (i % 2 == 0) {
assertEquals(info.getAvatarData(), null); assertEquals(null, info.getAvatarData());
} else { } else {
assertTrue(Arrays.equals(info.getAvatarData().getAvatar().getValue(), avatarHash)); assertTrue(Arrays.equals(info.getAvatarData().getAvatar().getValue(), avatarHash));
assertEquals(info.getAvatarData().getAvatarType().getValue(), NetAvatarType.EnumType.avatarImagePng); assertEquals(NetAvatarType.EnumType.avatarImagePng, info.getAvatarData().getAvatarType().getValue());
} }
} }
// Request invalid player info. // Request invalid player info.
tests/src/pokerth_test/RunRankingGameTest.java
+3 -3
View File
@@ -264,7 +264,7 @@ public class RunRankingGameTest extends TestBase {
gameResult.first(); gameResult.first();
long idgame = gameResult.getLong(1); long idgame = gameResult.getLong(1);
String dbGameName = gameResult.getString(2); String dbGameName = gameResult.getString(2);
assertEquals(gameName, dbGameName); assertEquals(dbGameName, gameName);
java.sql.Timestamp gameStart = gameResult.getTimestamp(3); java.sql.Timestamp gameStart = gameResult.getTimestamp(3);
java.sql.Timestamp gameEnd = gameResult.getTimestamp(4); java.sql.Timestamp gameEnd = gameResult.getTimestamp(4);
assertTrue(gameEnd.after(gameStart)); assertTrue(gameEnd.after(gameStart));
@@ -276,11 +276,11 @@ public class RunRankingGameTest extends TestBase {
// Check database entries for the players in the game. // Check database entries for the players in the game.
ResultSet gamePlayerResult = dbStatement.executeQuery("SELECT COUNT(DISTINCT player_idplayer) FROM game_has_player WHERE game_idgame = " + idgame); ResultSet gamePlayerResult = dbStatement.executeQuery("SELECT COUNT(DISTINCT player_idplayer) FROM game_has_player WHERE game_idgame = " + idgame);
gamePlayerResult.first(); gamePlayerResult.first();
assertEquals(gamePlayerResult.getLong(1), 10); assertEquals(10, gamePlayerResult.getLong(1));
// The one who always went all in should have won! // The one who always went all in should have won!
ResultSet winnerResult = dbStatement.executeQuery( ResultSet winnerResult = dbStatement.executeQuery(
"SELECT place FROM game_has_player LEFT JOIN player_login on (game_has_player.player_idplayer = player_login.id) WHERE game_idgame = " + idgame + " AND username = '" + AuthUser + "'"); "SELECT place FROM game_has_player LEFT JOIN player_login on (game_has_player.player_idplayer = player_login.id) WHERE game_idgame = " + idgame + " AND username = '" + AuthUser + "'");
winnerResult.first(); winnerResult.first();
assertEquals(winnerResult.getLong(1), 1); assertEquals(1, winnerResult.getLong(1));
} }
} }
tests/src/pokerth_test/TestBase.java
+1 -2
View File
@@ -87,8 +87,7 @@ public abstract class TestBase {
public long guestInit(Socket s) throws Exception { public long guestInit(Socket s) throws Exception {
long playerId = 0; long playerId = 0;
PokerTHMessage msg = receiveMessage(s); PokerTHMessage msg = receiveMessage(s);
AnnounceMessage announce = msg.getAnnounceMessage(); assertTrue(msg.isAnnounceMessageSelected());
assertTrue(announce.getValue().getServerType().getValue() == ServerTypeEnumType.EnumType.serverTypeInternetAuth);
Version requestedVersion = new Version(); Version requestedVersion = new Version();
requestedVersion.setMajor(PROTOCOL_VERSION_MAJOR); requestedVersion.setMajor(PROTOCOL_VERSION_MAJOR);