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

diff --git a/test b/test
index 4cdeb89..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 "==========="
@@ -470,6 +481,15 @@ empathy_player_activate()
     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()
 {
@@ -481,6 +501,13 @@ empathy_player_deactivate()
     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>
@@ -866,6 +893,12 @@ 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"
@@ -899,13 +932,87 @@ result=$(echo $(empathy_scores_names_numbers alice))
 test "$result" = '"alice" 1 "bob" 1 "charlie" 0'
 TEST_END
 
-empathy_deactivate_all()
-{
-    for player in ${empathy_players[*]}; do
-        empathy_player_deactivate $player
-    done
-}
+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
 
-empathy_deactivate_all
+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