X-Git-Url: https://git.cworth.org/git?p=lmno-server;a=blobdiff_plain;f=test;h=83f4cfb145e46561291579f7814233511c5708e3;hp=f62d6824315253edd01758f443ca946a393e2947;hb=HEAD;hpb=66b333239bd232c60cc1093aefc55c585af293cc

diff --git a/test b/test
index f62d682..83f4cfb 100755
--- a/test
+++ b/test
@@ -376,7 +376,7 @@ TEST_END
 
 TEST "Verify player-info event reports 'curl' name"
 result=$(tictactoe_player_info)
-test "$result" = 'data: {"id":1,"name":"curl","team":""}'
+test "$result" = 'data: {"id":1,"active":true,"name":"curl","team":""}'
 TEST_END
 
 TEST_SUBSECTION "Tic Tac Toe /player"
@@ -384,31 +384,31 @@ TEST_SUBSECTION "Tic Tac Toe /player"
 TEST "Change name to 'newname'"
 tictactoe_player_name newname
 result=$(tictactoe_player_info)
-test "$result" = 'data: {"id":1,"name":"newname","team":""}'
+test "$result" = 'data: {"id":1,"active":true,"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 "$result" = 'data: {"id":1,"active":true,"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 "$result" = 'data: {"id":1,"active":true,"name":"newname","team":"O"}'
 TEST_END
 
 TEST "Verify cannot change team to 'Z'"
 tictactoe_player_team Z
 result=$(tictactoe_player_info)
-test "$result" = 'data: {"id":1,"name":"newname","team":"O"}'
+test "$result" = 'data: {"id":1,"active":true,"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 "$result" = 'data: {"id":1,"active":true,"name":"newname","team":""}'
 TEST_END
 
 TEST_SUBSECTION "Tic Tac Toe /move"
@@ -441,6 +441,354 @@ result=$(tictactoe_move 4)
 test "$result" = '{"legal":false,"message":"Square is already occupied"}'
 TEST_END
 
+TEST_SECTION "Scribe game"
+
+TEST "Create Scribe game"
+scribe_game_id=$(new_game scribe)
+test "$scribe_game_id" != ""
+TEST_END $scribe_game_id
+
+scribe_game_path=scribe/$scribe_game_id
+
+# Usage: scribe_profile <name>
+scribe_profile()
+{
+    curl_put /profile "{ \"nickname\": \"$1\" }" "-c .cookie-scribe"
+}
+
+# Pulls a single named event out of the scribe event stream
+#
+# Usage: scribe_get_event <event_name>
+scribe_get_event()
+{
+    curl_get $scribe_game_path/events "-m 0.1 -b .cookie-scribe" 2>&1 \
+        | grep "^event: $1" -A 1 \
+        | grep ^data: \
+        | sed -e 's,^data: *,,'
+}
+
+# Usage: scribe_player_name
+scribe_get_player_name()
+{
+    scribe_get_event player-info | jq -r .name
+}
+
+TEST_SUBSECTION "Scribe player-info"
+
+TEST "Hit LMNO /profile to set name to 'test-suite'"
+scribe_profile test-suite
+TEST_END
+
+TEST "Verify player-info event reports 'test-suite' name"
+result=$(scribe_get_player_name)
+test "$result" = "test-suite"
+TEST_END
+
+scribe_player_info()
+{
+    scribe_get_event player-info
+}
+
+scribe_set_player_name()
+{
+    curl_put $scribe_game_path/player "{ \"name\": \"$1\" }" "-b .cookie-scribe"
+}
+
+scribe_set_player_team()
+{
+    curl_put $scribe_game_path/player "{ \"team\": \"$1\" }" "-b .cookie-scribe"
+}
+
+TEST_SUBSECTION "Scribe /player"
+
+TEST "Change name to 'testy'"
+scribe_set_player_name testy
+result=$(scribe_player_info)
+test "$result" = '{"id":1,"active":true,"name":"testy","team":""}'
+TEST_END
+
+TEST "Change team to '+'"
+scribe_set_player_team +
+result=$(scribe_player_info)
+test "$result" = '{"id":1,"active":true,"name":"testy","team":"+"}'
+TEST_END
+
+TEST "Change team to 'o'"
+scribe_set_player_team o
+result=$(scribe_player_info)
+test "$result" = '{"id":1,"active":true,"name":"testy","team":"o"}'
+TEST_END
+
+TEST "Verify cannot change team to 'X'"
+scribe_set_player_team X
+result=$(scribe_player_info)
+test "$result" = '{"id":1,"active":true,"name":"testy","team":"o"}'
+TEST_END
+
+TEST "Leave current team"
+scribe_set_player_team ""
+result=$(scribe_player_info)
+test "$result" = '{"id":1,"active":true,"name":"testy","team":""}'
+TEST_END
+
+scribe_move()
+{
+    curl_post $scribe_game_path/move "{ \"move\": $1 }" "-b .cookie-scribe"
+}
+
+TEST_SUBSECTION "Scribe /move"
+
+TEST "First move doesn't require a team"
+result=$(scribe_move '[4,0]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Second move does require a team"
+result=$(scribe_move '[0,3]')
+test "$result" = '{"legal":false,"message":"It'"'"'s not your turn to move"}'
+TEST_END
+
+TEST "Illegal to move when it's not your turn"
+scribe_set_player_team +
+result=$(scribe_move '[0,3]')
+test "$result" = '{"legal":false,"message":"It'"'"'s not your turn to move"}'
+TEST_END
+
+TEST "Legal move to an empty square"
+scribe_set_player_team o
+result=$(scribe_move '[0,3]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Move to same again is now illegal"
+scribe_set_player_team +
+result=$(scribe_move '[0,3]')
+test "$result" = '{"legal":false,"message":"Square is already occupied"}'
+TEST_END
+
+TEST "Move must be in correct mini-grid by last move"
+scribe_set_player_team +
+result=$(scribe_move '[1,8]')
+test "$result" = '{"legal":false,"message":"Move is inconsistent with your previous move"}'
+TEST_END
+
+TEST "Move in correct mini-grid is now legal"
+result=$(scribe_move '[0,8]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Several moves to fill up the mini-grid 0"
+scribe_set_player_team o
+scribe_move '[3,0]' >/dev/null
+scribe_set_player_team +
+scribe_move '[8,0]' >/dev/null
+scribe_set_player_team o
+scribe_move '[0,0]' >/dev/null
+scribe_set_player_team +
+scribe_move '[0,1]' >/dev/null
+scribe_set_player_team o
+scribe_move '[0,2]' >/dev/null
+scribe_set_player_team +
+scribe_move '[1,0]' >/dev/null
+scribe_set_player_team o
+scribe_move '[2,0]' >/dev/null
+scribe_set_player_team +
+scribe_move '[0,5]' >/dev/null
+scribe_set_player_team o
+scribe_move '[0,6]' >/dev/null
+scribe_set_player_team +
+scribe_move '[5,0]' >/dev/null
+scribe_set_player_team o
+scribe_move '[6,0]' >/dev/null
+scribe_set_player_team +
+scribe_move '[0,7]' >/dev/null
+scribe_set_player_team o
+scribe_move '[0,4]' >/dev/null
+scribe_set_player_team +
+result=$(scribe_move '[7,0]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Full mini grid allows a free move"
+scribe_set_player_team o
+scribe_move '[4,1]' >/dev/null
+scribe_set_player_team +
+result=$(scribe_move '[1,1]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player o forms Cross glyph"
+scribe_set_player_team o
+scribe_move '[1,4]' >/dev/null
+scribe_set_player_team +
+scribe_move '[1,2]' >/dev/null
+scribe_set_player_team o
+scribe_move '[4,4]' >/dev/null
+scribe_set_player_team +
+scribe_move '[2,1]' >/dev/null
+scribe_set_player_team o
+scribe_move '[4,7]' >/dev/null
+scribe_set_player_team +
+scribe_move '[1,5]' >/dev/null
+scribe_set_player_team o
+scribe_move '[7,4]' >/dev/null
+scribe_set_player_team +
+scribe_move '[5,1]' >/dev/null
+scribe_set_player_team o
+scribe_move '[4,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[1,8]' >/dev/null
+scribe_set_player_team o
+scribe_move '[3,4]' >/dev/null
+scribe_set_player_team +
+scribe_move '[8,1]' >/dev/null
+scribe_set_player_team o
+result=$(scribe_move '[4,5]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player + forms J glyph"
+scribe_set_player_team +
+result=$(scribe_move '[1,7]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player + forms Earring glyph"
+scribe_set_player_team o
+scribe_move '[5,4]' >/dev/null
+scribe_set_player_team +
+scribe_move '[7,1]' >/dev/null
+scribe_set_player_team o
+scribe_move '[4,6]' >/dev/null
+scribe_set_player_team +
+result=$(scribe_move '[1,3]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player o forms House glyph"
+scribe_set_player_team o
+scribe_move '[6,4]' >/dev/null
+scribe_set_player_team +
+scribe_move '[3,1]' >/dev/null
+scribe_set_player_team o
+result=$(scribe_move '[4,8]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player + forms O glyph"
+scribe_set_player_team +
+result=$(scribe_move '[1,6]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player o forms T glyph"
+scribe_set_player_team o
+scribe_move '[8,6]' >/dev/null
+scribe_set_player_team +
+scribe_move '[6,7]' >/dev/null
+scribe_set_player_team o
+scribe_move '[6,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[7,8]' >/dev/null
+scribe_set_player_team o
+scribe_move '[3,6]' >/dev/null
+scribe_set_player_team +
+scribe_move '[8,2]' >/dev/null
+scribe_set_player_team o
+scribe_move '[6,6]' >/dev/null
+scribe_set_player_team +
+scribe_move '[2,8]' >/dev/null
+scribe_set_player_team o
+result=$(scribe_move '[6,5]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player o forms Chair glyph"
+scribe_set_player_team +
+scribe_move '[8,5]' >/dev/null
+scribe_set_player_team o
+scribe_move '[5,6]' >/dev/null
+scribe_set_player_team +
+scribe_move '[5,8]' >/dev/null
+scribe_set_player_team o
+result=$(scribe_move '[6,2]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player + forms Bomber glyph"
+scribe_set_player_team +
+scribe_move '[8,8]' >/dev/null
+scribe_set_player_team o
+scribe_move '[2,6]' >/dev/null
+scribe_set_player_team +
+result=$(scribe_move '[8,4]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player o forms H glyph"
+scribe_set_player_team o
+result=$(scribe_move '[6,8]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player + forms 6-Block glyph"
+scribe_set_player_team +
+scribe_move '[4,2]' >/dev/null
+scribe_set_player_team o
+scribe_move '[8,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[2,4]' >/dev/null
+scribe_set_player_team o
+scribe_move '[3,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[2,2]' >/dev/null
+scribe_set_player_team o
+scribe_move '[3,7]' >/dev/null
+scribe_set_player_team +
+scribe_move '[2,5]' >/dev/null
+scribe_set_player_team o
+scribe_move '[7,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[5,2]' >/dev/null
+scribe_set_player_team o
+scribe_move '[3,2]' >/dev/null
+scribe_set_player_team +
+result=$(scribe_move '[2,7]')
+test "$result" = '{"legal":true}'
+TEST_END
+
+TEST "Player o forms Ottoman glyph"
+scribe_set_player_team o
+scribe_move '[2,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[7,7]' >/dev/null
+scribe_set_player_team o
+scribe_move '[3,5]' >/dev/null
+scribe_set_player_team +
+scribe_move '[7,2]' >/dev/null
+scribe_set_player_team o
+scribe_move '[5,3]' >/dev/null
+scribe_set_player_team +
+scribe_move '[7,6]' >/dev/null
+scribe_set_player_team o
+result=$(scribe_move '[3,8]')
+test "$result"='{"legal":true}'
+TEST_END
+
+TEST "Player + forms J glyph"
+scribe_set_player_team +
+scribe_move '[6,1]' >/dev/null
+scribe_set_player_team o
+scribe_move '[8,7]' >/dev/null
+scribe_set_player_team +
+scribe_move '[5,5]' >/dev/null
+scribe_set_player_team o
+scribe_move '[7,5]' >/dev/null
+scribe_set_player_team +
+result=$(scribe_move '[5,7]')
+test "$result"='{"legal":true}'
+TEST_END
+
 TEST_SECTION "Empathy game"
 
 TEST_SUBSECTION "Create a game and register 3 players"
@@ -655,12 +1003,12 @@ empathy_judged()
 }
 
 TEST "Submit word groups from alice"
-result=$(empathy_judged alice $prompt_id '[["sun","SunLight","SunShine"],["sand","sands","Grains of Sand"],["water","wafer"]]')
+result=$(empathy_judged alice $prompt_id '[{"words":["sun","SunLight","SunShine"],"kudos":false},{"words":["sand","sands","Grains of Sand"],"kudos":false},{"words":["water","wafer"],"kudos":false}]')
 test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit word groups from bob"
-result=$(empathy_judged bob $prompt_id '[["sands","grains of sand"],["water","wafer"]]')
+result=$(empathy_judged bob $prompt_id '[{"words":["sands","grains of sand"],"kudos":false},{"words":["water","wafer"],"kudos":false}]')
 test "$result" = '{"valid":true}'
 TEST_END
 
@@ -676,7 +1024,7 @@ test "$result" = "null"
 TEST_END
 
 TEST "Submit word groups from charlie"
-result=$(empathy_judged charlie $prompt_id '[["SunLight","SunShine"],["sand","Grains of Sand"]]')
+result=$(empathy_judged charlie $prompt_id '[{"words":["SunLight","SunShine"],"kudos":false},{"words":["sand","Grains of Sand"],"kudos":false}]')
 test "$result" = '{"valid":true}'
 TEST_END
 
@@ -690,7 +1038,7 @@ TEST_END
 # Usage: empathy_scores_names_numbers <player_name>
 empathy_scores_names_numbers()
 {
-    empathy_get_event $1 game-state | jq '.scores.scores[]|.player,.score'
+    empathy_get_event $1 game-state | jq '.scores.scores[]|.players[],.score'
 }
 
 TEST_SUBSECTION "Scoring"
@@ -856,6 +1204,16 @@ result=$(echo $(empathy_scores alice))
 test "$result" = "null"
 TEST_END
 
+TEST "Submit word groups from a non-answering player"
+result=$(empathy_judged dale $prompt_id '[]')
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Scoring still hasn't started"
+result=$(echo $(empathy_scores alice))
+test "$result" = "null"
+TEST_END
+
 TEST "Submit word groups from last answering player"
 result=$(empathy_judged charlie $prompt_id '[]')
 test "$result" = '{"valid":true}'
@@ -882,7 +1240,7 @@ test "$?" = "0"
 TEST_END
 
 TEST "1 player votes for a match"
-empathy_judged alice $prompt_id '[["truth","true"]]' >/dev/null
+empathy_judged alice $prompt_id '[{"words":["truth","true"],"kudos":false}]' >/dev/null
 result=$(empathy_judged bob $prompt_id '[]')
 test "$result" = '{"valid":true}'
 TEST_END
@@ -890,7 +1248,7 @@ TEST_END
 TEST "Verify the match passed the vote"
 # echo here is to strip newlines
 result=$(echo $(empathy_scores_names_numbers alice))
-test "$result" = '"alice" 2 "bob" 2 "charlie" 0 "dale" 0 "eric" 0 "fred" 0'
+test "$result" = '"alice" "bob" 2 "charlie" "dale" "eric" "fred" 0'
 TEST_END
 
 echo ""
@@ -929,7 +1287,7 @@ TEST_END
 TEST "Verify scores don't include inactive players"
 # echo here is to strip newlines
 result=$(echo $(empathy_scores_names_numbers alice))
-test "$result" = '"alice" 1 "bob" 1 "charlie" 0'
+test "$result" = '"alice" "bob" 1 "charlie" 0'
 TEST_END
 
 TEST_SUBSECTION "Deactivated players don't block future game phase advances"