X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test;h=8d01515418720f7d185854fa25cbc67a5c761179;hb=99fe599c5e4efab0fd285bc58f39ea09e2655dad;hp=e19539b16ba09d9177986689113b139b94f03a50;hpb=5c589dc3c8016c2f43174b1cf6de3e934835a142;p=lmno-server

diff --git a/test b/test
index e19539b..8d01515 100755
--- a/test
+++ b/test
@@ -300,58 +300,102 @@ TEST_SECTION "Tic Tac Toe game"
 
 tictactoe_game_path=tictactoe/$tictactoe_game_id
 
-tictactoe_move()
+tictactoe_profile()
 {
-    curl_post $tictactoe_game_path/move "{ \"move\": $1 }"
+    curl_put /profile "{ \"nickname\": \"$1\" }" "-c .cookie-tictactoe"
 }
 
-lmno_profile()
+tictactoe_move()
 {
-    curl_put /profile "{ \"nickname\": \"$1\" }" "-c .test-cookie"
+    curl_post $tictactoe_game_path/move "{ \"move\": $1 }" "-b .cookie-tictactoe"
 }
 
 tictactoe_player_info()
 {
-    curl_get $tictactoe_game_path/events  "-m 0.1 -b .test-cookie" 2>&1 \
+    curl_get $tictactoe_game_path/events  "-m 0.1 -b .cookie-tictactoe" 2>&1 \
         | grep player-info -A 1 \
         | grep ^data
 }
 
-tictactoe_player()
+tictactoe_player_name()
+{
+    curl_put $tictactoe_game_path/player "{ \"name\": \"$1\" }" "-b .cookie-tictactoe"
+}
+
+tictactoe_player_team()
 {
-    curl_put $tictactoe_game_path/player "{ \"name\": \"$1\" }" "-b .test-cookie"
+    curl_put $tictactoe_game_path/player "{ \"team\": \"$1\" }" "-b .cookie-tictactoe"
 }
 
 TEST_SUBSECTION "Tic Tac Toe player-info"
 
 TEST "Hit LMNO /profile to set name to 'curl'"
-lmno_profile curl
+tictactoe_profile curl
 TEST_END
 
 TEST "Verify player-info event reports 'curl' name"
 result=$(tictactoe_player_info)
-test "$result" = 'data: {"id":1,"name":"curl"}'
+test "$result" = 'data: {"id":1,"name":"curl","team":""}'
 TEST_END
 
 TEST_SUBSECTION "Tic Tac Toe /player"
 
 TEST "Change name to 'newname'"
-tictactoe_player newname
+tictactoe_player_name newname
+result=$(tictactoe_player_info)
+test "$result" = 'data: {"id":1,"name":"newname","team":""}'
+TEST_END
+
+TEST "Change team to 'X'"
+tictactoe_player_team X
+result=$(tictactoe_player_info)
+test "$result" = 'data: {"id":1,"name":"newname","team":"X"}'
+TEST_END
+
+TEST "Change team to 'O'"
+tictactoe_player_team O
+result=$(tictactoe_player_info)
+test "$result" = 'data: {"id":1,"name":"newname","team":"O"}'
 TEST_END
 
-TEST "Verify player-info event reports 'newname'"
+TEST "Verify cannot change team to 'Z'"
+tictactoe_player_team Z
 result=$(tictactoe_player_info)
-test "$result" = 'data: {"id":1,"name":"newname"}'
+test "$result" = 'data: {"id":1,"name":"newname","team":"O"}'
+TEST_END
+
+TEST "Leave current team"
+tictactoe_player_team ""
+result=$(tictactoe_player_info)
+test "$result" = 'data: {"id":1,"name":"newname","team":""}'
 TEST_END
 
 TEST_SUBSECTION "Tic Tac Toe /move"
 
-TEST "Move to the center square"
+TEST "First move doesn't require a team"
+result=$(tictactoe_move 0)
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Second move does require a team"
+result=$(tictactoe_move 4)
+test "$result" = '{"legal":false,"message":"It'"'"'s not your turn to move"}'
+TEST_END
+
+TEST "Illegal to move when it's not your turn"
+tictactoe_player_team X
+result=$(tictactoe_move 4)
+test "$result" = '{"legal":false,"message":"It'"'"'s not your turn to move"}'
+TEST_END
+
+TEST "Legal move to center square"
+tictactoe_player_team O
 result=$(tictactoe_move 4)
 test "$result" = '{"legal":true}'
 TEST_END
 
 TEST "Move to center square again is now illegal"
+tictactoe_player_team X
 result=$(tictactoe_move 4)
 test "$result" = '{"legal":false,"message":"Square is already occupied"}'
 TEST_END