X-Git-Url: https://git.cworth.org/git?p=lmno-server;a=blobdiff_plain;f=test;h=9167ed4f1a6cc03e58651159133b125edb06f638;hp=27469ee243e44b404cdbcb9bc54d9d1fa7225ff4;hb=c79d4a69a16751758d627a57bea93db9ac712888;hpb=1c0d86cea49a79e94c884ffd4c811fe696db534b

diff --git a/test b/test
index 27469ee..9167ed4 100755
--- a/test
+++ b/test
@@ -512,19 +512,32 @@ result=$(empathy_answer $bob $prompt_id '"sand", "sands", "SunLight", "towels"')
 test "$result" = '{"valid":true}'
 TEST_END
 
+empathy_ambiguities()
+{
+    curl_get_event $empathy_game_path/events game-state "-b $1" \
+        | jq .ambiguities
+}
+
+TEST "Judging hasn't started with player unsubmitted"
+result=$(echo $(empathy_ambiguities $alice))
+test "$result" = "null"
+TEST_END
+
 TEST "Submit from charlie succeeds"
 result=$(empathy_answer $charlie $prompt_id '"SunShine", "Grains of Sand", "wafer", "people"')
 test "$result" = '{"valid":true}'
 TEST_END
 
-empathy_judging()
-{
-    curl_post $empathy_game_path/judging/$2 "{ \"word_groups\": $3}" "-b $1"
-}
+TEST_SUBSECTION "Transition from answering to judging (no voting needed)"
+
+TEST "Judging already started"
+result=$(echo $(empathy_ambiguities $alice))
+test "$result" != "null"
+TEST_END
 
 TEST_SUBSECTION "Judging answers"
 
-empathy_ambiguities()
+empathy_ambiguities_list()
 {
     curl_get_event $empathy_game_path/events game-state "-b $1" \
         | jq .ambiguities[]
@@ -532,26 +545,49 @@ empathy_ambiguities()
 
 TEST "Received all unique words"
 # echo here is to strip newlines
-result=$(echo $(empathy_ambiguities $alice))
+result=$(echo $(empathy_ambiguities_list $alice))
 test "$result" = '"Grains of Sand" "people" "sand" "sands" "sun" "SunLight" "SunShine" "towels" "wafer" "water"'
 TEST_END
 
+empathy_judged()
+{
+    curl_post $empathy_game_path/judged/$2 "{ \"word_groups\": $3}" "-b $1"
+}
+
 TEST "Submit word groups from alice"
-result=$(empathy_judging $alice $prompt_id '[["sun","SunLight","SunShine"],["sand","sands","Grains of Sand"],["water","wafer"]]')
+result=$(empathy_judged $alice $prompt_id '[["sun","SunLight","SunShine"],["sand","sands","Grains of Sand"],["water","wafer"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit word groups from bob"
-result=$(empathy_judging $bob $prompt_id '[["sands","Grains of Sand"],["water","wafer"]]')
+result=$(empathy_judged $bob $prompt_id '[["sands","grains of sand"],["water","wafer"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
+empathy_scores()
+{
+    curl_get_event $empathy_game_path/events game-state "-b $1" \
+        | jq .scores
+}
+
+TEST "Scoring hasn't started with player unsubmitted"
+result=$(echo $(empathy_scores $alice))
+test "$result" = "null"
+TEST_END
+
 TEST "Submit word groups from charlie"
-result=$(empathy_judging $charlie $prompt_id '[["SunLight","SunShine"],["sand","Grains of Sand"]]')
+result=$(empathy_judged $charlie $prompt_id '[["SunLight","SunShine"],["sand","Grains of Sand"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
-empathy_scores()
+TEST_SUBSECTION "Transition from judging to scoring (no voting needed)"
+
+TEST "Scoring already started"
+result=$(echo $(empathy_scores $alice))
+test "$result" != "null"
+TEST_END
+
+empathy_scores_names_numbers()
 {
     curl_get_event $empathy_game_path/events game-state "-b $1" \
         | jq '.scores.scores[]|.player,.score'
@@ -561,7 +597,7 @@ TEST_SUBSECTION "Scoring"
 
 TEST "Verify final scores as expected"
 # echo here is to strip newlines
-result=$(echo $(empathy_scores $alice))
+result=$(echo $(empathy_scores_names_numbers $alice))
 test "$result" = '"charlie" 9 "alice" 8 "bob" 6'
 TEST_END
 
@@ -577,4 +613,106 @@ result=$(echo $(empathy_words_submitted $alice))
 test "$result" = '"Grains of Sand/sand/sands" "SunLight/SunShine" "wafer/water" "people" "sun" "towels"'
 TEST_END
 
+TEST_SUBSECTION "New game (using voting to advance phases)"
+
+empathy_reset()
+{
+    curl_post $empathy_game_path/reset
+}
+
+TEST "Any post to /reset resets the game"
+empathy_reset
+test "$?" = "0"
+TEST_END
+
+TEST "Verify scoring is over"
+result=$(echo $(empathy_scores $alice))
+test "$result" = "null"
+TEST_END
+
+empathy_answering()
+{
+    curl_post $empathy_game_path/answering/$2 "" "-b $1"
+}
+
+TEST "Start 4-player game, 3 submissions"
+dale=$(empathy_profile dale)
+result=$(empathy_player_name $dale)
+test "$result" = "dale"
+prompt_id=$(empathy_submit_prompt $alice 4 "3 little words" | jq .id)
+empathy_start $alice $prompt_id
+empathy_answer $alice   $prompt_id '"I",    "love", "you"' >/dev/null
+empathy_answer $bob     $prompt_id '"I",    "love", "food"' >/dev/null
+empathy_answer $charlie $prompt_id '"food", "is",   "good"' >/dev/null
+result=$(empathy_answering $dale $prompt_id)
+test "$result" = '{"valid":true}'
+TEST_END
+
+TEST "Judging hasn't started with player unsubmitted"
+result=$(echo $(empathy_ambiguities $alice))
+test "$result" = "null"
+TEST_END
+
+empathy_end_answers()
+{
+    curl_post $empathy_game_path/end-answers/$2 "" "-b $1"
+}
+
+TEST "Minority of players vote to end answering"
+empathy_end_answers $alice $prompt_id
+empathy_end_answers $bob $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Judging still hasn't started"
+result=$(echo $(empathy_ambiguities $alice))
+test "$result" = "null"
+TEST_END
+
+TEST "Majority of players vote to end answering"
+empathy_end_answers $charlie $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Judging has now started"
+result=$(echo $(empathy_ambiguities $alice))
+test "$result" != "null"
+TEST_END
+
+TEST "Submit word groups from majority"
+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
+
+empathy_end_judging()
+{
+    curl_post $empathy_game_path/end-judging/$2 "" "-b $1"
+}
+
+TEST "Minority of players vote to end judging"
+empathy_end_judging $alice $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Scoring still hasn't started"
+result=$(echo $(empathy_scores $alice))
+test "$result" = "null"
+TEST_END
+
+TEST "Majority of players vote to end judging"
+empathy_end_judging $bob $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Scoring has now started"
+result=$(echo $(empathy_scores $alice))
+test "$result" != "null"
+TEST_END
+
 TEST_REPORT