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

diff --git a/test b/test
index 9d172c7..f62d682 100755
--- a/test
+++ b/test
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+# Arrange for some cleanup to be executed if the user interrupts the
+# test sutie (for example, by pressing ControlC at the controlling
+# terminal).
+cleanup_and_report() {
+    empathy_deactivate_all >/dev/null 2>&1
+    TEST_REPORT
+    exit $?
+}
+trap cleanup_and_report INT
+
 usage ()
 {
     echo "Usage:$0 <URL-to-test>"
@@ -60,6 +70,7 @@ TEST_END()
 # Print report of all previous test results
 TEST_REPORT()
 {
+    echo ""
     echo ""
     echo "Test Report"
     echo "==========="
@@ -441,6 +452,18 @@ TEST_END $empathy_game_id
 
 empathy_game_path=empathy/$empathy_game_id
 
+# Usage: empathy_get <player_name> <endpoint> [curl_options]
+empathy_get()
+{
+    curl_get_cookie $1 $empathy_game_path/$2 "${3:-}"
+}
+
+# Usage: empathy_post <player_name> <endpoint> [data]
+empathy_post()
+{
+    curl_post_cookie $1 $empathy_game_path/$2 "${3:-}"
+}
+
 # Given a player name as $1 (eg. "empathy_player_activate alice") set both
 # $1_cookie and $1_pid (that is $alice_cookie and $alice_pid) to
 # a filename containing a cookie and the PID of a running event-streaming
@@ -453,21 +476,53 @@ empathy_player_activate()
 
     eval ${player_cookie}=".cookie-empathy-$player"
     curl_put /profile "{ \"nickname\": \"$player\" }" "-c ${!player_cookie}"
-    curl_get_cookie $player $empathy_game_path/events >/dev/null 2>&1 &
+    empathy_get $player events >/dev/null 2>&1 &
+    eval ${player_pid}=$!
+    empathy_players+=($player)
+}
+
+empathy_player_reactivate()
+{
+    player="$1"
+    player_pid=${player}_pid
+
+    empathy_get $player events >/dev/null 2>&1 &
     eval ${player_pid}=$!
 }
 
+# Usage: empathy_player_deactivate <player_name>
+empathy_player_deactivate()
+{
+    player="$1"
+    player_pid=${player}_pid
+    if [ "${!player_pid}" != "" ]; then
+        pkill -P ${!player_pid}
+    fi
+    eval ${player_pid}=""
+}
+
+empathy_deactivate_all()
+{
+    for player in ${empathy_players[*]}; do
+        empathy_player_deactivate $player
+    done
+}
+
+# Pulls a single named event out of the empathy event stream
+#
+# Usage: empathy_get_event <player_name> <event_name>
 empathy_get_event()
 {
-    curl_get_cookie $1 $2 "-m 0.1" 2>&1 \
-        | grep "^event: $3" -A 1 \
+    empathy_get $1 events "-m 0.1" 2>&1 \
+        | grep "^event: $2" -A 1 \
         | grep ^data: \
         | sed -e 's,^data: *,,'
 }
 
+# Usage: empathy_player_name <player_name>
 empathy_player_name()
 {
-    empathy_get_event $1 $empathy_game_path/events player-info | jq -r .name
+    empathy_get_event $1 player-info | jq -r .name
 }
 
 TEST "Set 'alice' in session"
@@ -494,9 +549,10 @@ TEST_END
 
 TEST_SUBSECTION "Category selection"
 
+# Usage: empathy_submit_prompt <player_name> <count> <prompt_string>
 empathy_submit_prompt()
 {
-    curl_post_cookie $1 $empathy_game_path/prompts "{ \"items\": $2, \"prompt\": \"$3\"}"
+    empathy_post $1 prompts "{ \"items\": $2, \"prompt\": \"$3\"}"
 }
 
 TEST "Huge numbers are rejected"
@@ -509,9 +565,10 @@ prompt_id=$(empathy_submit_prompt alice 4 "4 things on a beach" | jq .id)
 test "$prompt_id" = "1"
 TEST_END
 
+# Usage: empathy_vote <player_name> <prompt_id>
 empathy_vote()
 {
-    curl_post_cookie $1 $empathy_game_path/vote/$2
+    empathy_post $1 vote/$2
 }
 
 TEST "Vote on this category"
@@ -519,9 +576,10 @@ empathy_vote alice $prompt_id
 test "$?" = "0"
 TEST_END
 
+# Usage: empathy_start <player_name> <prompt_id>
 empathy_start()
 {
-    curl_post_cookie $1 $empathy_game_path/start/$2
+    empathy_post $1 start/$2
 }
 
 TEST "Start the game with this category"
@@ -529,9 +587,10 @@ empathy_start alice $prompt_id
 test "$?" = "0"
 TEST_END
 
+# Usage: empathy_answer <player_name> <prompt_id> <answers_string>
 empathy_answer()
 {
-    curl_post_cookie $1 $empathy_game_path/answer/$2 "{ \"answers\": [$3]}"
+    empathy_post $1 answer/$2 "{ \"answers\": [$3]}"
 }
 
 TEST_SUBSECTION "Submitting answers"
@@ -552,10 +611,10 @@ result=$(empathy_answer bob $prompt_id '"sand", "sands", "SunLight", "towels"')
 test "$result" = '{"valid":true}'
 TEST_END
 
+# Usage: empathy_ambiguities <player_name>
 empathy_ambiguities()
 {
-    empathy_get_event $1 $empathy_game_path/events game-state \
-        | jq .ambiguities
+    empathy_get_event $1 game-state | jq .ambiguities
 }
 
 TEST "Judging hasn't started with player unsubmitted"
@@ -577,10 +636,10 @@ TEST_END
 
 TEST_SUBSECTION "Judging answers"
 
+# Usage: empathy_ambiguities_list <player_name>
 empathy_ambiguities_list()
 {
-    empathy_get_event $1 $empathy_game_path/events game-state \
-        | jq .ambiguities[]
+    empathy_get_event $1 game-state | jq .ambiguities[]
 }
 
 TEST "Received all unique words"
@@ -589,9 +648,10 @@ result=$(echo $(empathy_ambiguities_list alice))
 test "$result" = '"Grains of Sand" "people" "sand" "sands" "sun" "SunLight" "SunShine" "towels" "wafer" "water"'
 TEST_END
 
+# Usage: empathy_judged <player_name> <prompt_id> <word_groups_string>
 empathy_judged()
 {
-    curl_post_cookie $1 $empathy_game_path/judged/$2 "{ \"word_groups\": $3}"
+    empathy_post $1 judged/$2 "{ \"word_groups\": $3}"
 }
 
 TEST "Submit word groups from alice"
@@ -604,10 +664,10 @@ result=$(empathy_judged bob $prompt_id '[["sands","grains of sand"],["water","wa
 test "$result" = '{"valid":true}'
 TEST_END
 
+# Usage: empathy_scores <player_name>
 empathy_scores()
 {
-    empathy_get_event $1 $empathy_game_path/events game-state \
-        | jq .scores
+    empathy_get_event $1 game-state | jq .scores
 }
 
 TEST "Scoring hasn't started with player unsubmitted"
@@ -627,10 +687,10 @@ result=$(echo $(empathy_scores alice))
 test "$result" != "null"
 TEST_END
 
+# Usage: empathy_scores_names_numbers <player_name>
 empathy_scores_names_numbers()
 {
-    empathy_get_event $1 $empathy_game_path/events game-state \
-        | jq '.scores.scores[]|.player,.score'
+    empathy_get_event $1 game-state | jq '.scores.scores[]|.player,.score'
 }
 
 TEST_SUBSECTION "Scoring"
@@ -641,10 +701,10 @@ result=$(echo $(empathy_scores_names_numbers alice))
 test "$result" = '"charlie" 9 "alice" 8 "bob" 6'
 TEST_END
 
+# Usage: empathy_words_submitted <player_name>
 empathy_words_submitted()
 {
-    empathy_get_event $1 $empathy_game_path/events game-state \
-        | jq '.scores.words[].word'
+    empathy_get_event $1 game-state | jq '.scores.words[].word'
 }
 
 TEST "Verify final list of words submitted"
@@ -670,9 +730,10 @@ result=$(echo $(empathy_scores alice))
 test "$result" = "null"
 TEST_END
 
+# Usage: empathy_answering <player_name> <prompt_id>
 empathy_answering()
 {
-    curl_post_cookie $1 $empathy_game_path/answering/$2
+    empathy_post $1 answering/$2
 }
 
 TEST "Start 4-player game, 3 submissions"
@@ -693,9 +754,10 @@ result=$(echo $(empathy_ambiguities alice))
 test "$result" = "null"
 TEST_END
 
+# Usage: empathy_end_answers <player_name> <prompt_id>
 empathy_end_answers()
 {
-    curl_post_cookie $1 $empathy_game_path/end-answers/$2
+    empathy_post $1 end-answers/$2
 }
 
 TEST "Minority of players vote to end answering"
@@ -719,6 +781,18 @@ result=$(echo $(empathy_ambiguities alice))
 test "$result" != "null"
 TEST_END
 
+# Usage: empathy_players_judging <player_name>
+empathy_players_judging()
+{
+    empathy_get_event $1 game-state | jq .players_judging[]
+}
+
+TEST "Verify active players listed as judging"
+# echo here is to strip newlines
+result=$(echo $(empathy_players_judging alice))
+test "$result" = '"alice" "bob" "charlie"'
+TEST_END
+
 TEST "Submit word groups from majority"
 empathy_judged alice $prompt_id '[]' >/dev/null
 result=$(empathy_judged bob $prompt_id '[]')
@@ -730,9 +804,10 @@ result=$(echo $(empathy_scores alice))
 test "$result" = "null"
 TEST_END
 
+# Usage: empathy_end_judging <player_name> <prompt_id>
 empathy_end_judging()
 {
-    curl_post_cookie $1 $empathy_game_path/end-judging/$2
+    empathy_post $1 end-judging/$2
 }
 
 TEST "Minority of players vote to end judging"
@@ -755,9 +830,189 @@ result=$(echo $(empathy_scores alice))
 test "$result" != "null"
 TEST_END
 
-pkill -P $alice_pid
-pkill -P $bob_pid
-pkill -P $charlie_pid
-pkill -P $dale_pid
+TEST_SUBSECTION "New game (no voting needed when all answered players judge)"
+
+TEST "Start 4-player game, 3 submissions"
+empathy_reset
+prompt_id=$(empathy_submit_prompt alice 4 "1 truth or dare" | jq .id)
+empathy_start alice $prompt_id
+empathy_answer alice   $prompt_id '"truth"' >/dev/null
+empathy_answer bob     $prompt_id '"truth"' >/dev/null
+empathy_answer charlie $prompt_id '"dare"' >/dev/null
+empathy_end_answers alice $prompt_id
+empathy_end_answers bob $prompt_id
+empathy_end_answers charlie $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Submit word groups from 2 players"
+empathy_judged alice $prompt_id '[]' >/dev/null
+result=$(empathy_judged bob $prompt_id '[]')
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Scoring hasn't started with player unsubmitted"
+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}'
+TEST_END
+
+TEST "Scoring has now started"
+result=$(echo $(empathy_scores alice))
+test "$result" != "null"
+TEST_END
+
+TEST_SUBSECTION "Non players don't affect judging requirements"
+
+TEST "Start 2-player game with 6 registered players"
+empathy_reset
+empathy_player_activate eric
+empathy_player_activate fred
+prompt_id=$(empathy_submit_prompt alice 4 "1 truth or dare" | jq .id)
+empathy_start alice $prompt_id
+empathy_answer alice $prompt_id '"truth"' >/dev/null
+empathy_answer bob   $prompt_id '"true"' >/dev/null
+empathy_end_answers alice $prompt_id
+empathy_end_answers bob $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "1 player votes for a match"
+empathy_judged alice $prompt_id '[["truth","true"]]' >/dev/null
+result=$(empathy_judged bob $prompt_id '[]')
+test "$result" = '{"valid":true}'
+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_END
+
+echo ""
+echo "NOTE: Slow tests ahead!"
+echo "If you are impatient and somehow \"know\" you don't care about the"
+echo "tests below then you can interrupt the test suite with Control-C"
+echo "to get a summary report on the tests that have already been run."
+
+TEST_SUBSECTION "Inactive players don't appear in scores"
+
+TEST "Start 2-player game with 6 registered players"
+empathy_reset
+prompt_id=$(empathy_submit_prompt alice 4 "1 best pet" | jq .id)
+empathy_start alice $prompt_id
+empathy_answer alice $prompt_id '"cats"' >/dev/null
+empathy_answer bob   $prompt_id '"dogs"' >/dev/null
+empathy_end_answers alice $prompt_id
+empathy_end_answers bob $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Deactivate 3 players"
+empathy_player_deactivate dale
+empathy_player_deactivate eric
+empathy_player_deactivate fred
+sleep 30
+test "$?" = "0"
+TEST_END
+
+TEST "Finish game with 2 active players"
+empathy_judged alice $prompt_id '[]' >/dev/null
+result=$(empathy_judged bob $prompt_id '[]')
+test "$result" = '{"valid":true}'
+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_END
+
+TEST_SUBSECTION "Deactivated players don't block future game phase advances"
+
+TEST "New 3-player game, 2 submit right away"
+empathy_reset
+prompt_id=$(empathy_submit_prompt charlie 4 "2 legit 2 quit" | jq .id)
+empathy_start alice $prompt_id
+empathy_answer alice $prompt_id '"what", "gives?"' >/dev/null
+empathy_answer bob   $prompt_id '"so", "confused"' >/dev/null
+test "$?" = "0"
+TEST_END
+
+TEST "Judging hasn't started with player unsubmitted"
+result=$(echo $(empathy_ambiguities alice))
+test "$result" = "null"
+TEST_END
+
+TEST "Final active player submits"
+result=$(empathy_answer charlie $prompt_id '"best", "category"')
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Judging has started (don't need inactive players)"
+result=$(echo $(empathy_ambiguities alice))
+test "$result" != "null"
+TEST_END
+
+TEST "Submit word groups from 2 players"
+empathy_judged alice $prompt_id '[]' >/dev/null
+result=$(empathy_judged bob $prompt_id '[]')
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Scoring hasn't started with player unsubmitted"
+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}'
+TEST_END
+
+TEST "Scoring has now started"
+result=$(echo $(empathy_scores alice))
+test "$result" != "null"
+TEST_END
+
+TEST_SUBSECTION "Reactivated player is fully active"
+
+TEST "The dale player is currently deactivated"
+test "$dale_pid" = ""
+TEST_END
+
+TEST "Reactivate dale"
+empathy_player_reactivate dale
+test "$dale_pid" != ""
+TEST_END
+
+TEST "New 4-player game, 3 submit right away"
+empathy_reset
+prompt_id=$(empathy_submit_prompt alice 1 "favorite letter" | jq .id)
+empathy_start alice $prompt_id
+empathy_answer alice   $prompt_id '"A"' >/dev/null
+empathy_answer bob     $prompt_id '"B"' >/dev/null
+empathy_answer charlie $prompt_id '"C"' >/dev/null
+test "$?" = "0"
+TEST_END
+
+TEST "Judging hasn't started with player unsubmitted"
+result=$(echo $(empathy_ambiguities alice))
+test "$result" = "null"
+TEST_END
+
+TEST "Final active player submits"
+result=$(empathy_answer dale $prompt_id '"D"')
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Judging has started now"
+result=$(echo $(empathy_ambiguities alice))
+test "$result" != "null"
+TEST_END
 
-TEST_REPORT
+cleanup_and_report