X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test;h=f117234e66ff98b78aec86f9746c7c2b856089c8;hb=2a7c76574f343ce95f7100b62b7d42842afaa6da;hp=7113659eb5d40f2c7fadb3572ec53eed5f2b8dd9;hpb=abea9915939bd7f5b6e70f12d724f19dc6694ec9;p=empires-server

diff --git a/test b/test
index 7113659..f117234 100755
--- a/test
+++ b/test
@@ -517,14 +517,39 @@ result=$(empathy_answer $charlie $prompt_id '"SunShine", "Grains of Sand", "wafe
 test "$result" = '{"valid":true}'
 TEST_END
 
-empathy_judging()
+TEST_SUBSECTION "Transition from answering to judging"
+
+empathy_ambiguities()
 {
-    curl_post $empathy_game_path/judging/$2 "{ \"word_groups\": $3}" "-b $1"
+    curl_get_event $empathy_game_path/events game-state "-b $1" \
+        | jq .ambiguities
 }
 
+TEST "Judging has not yet started"
+result=$(echo $(empathy_ambiguities $alice))
+test "$result" = "null"
+TEST_END
+
+empathy_end_answers()
+{
+    curl_post $empathy_game_path/end-answers/$2 "" "-b $1"
+}
+
+TEST "Players vote to start judging"
+empathy_end_answers $alice $prompt_id
+empathy_end_answers $bob $prompt_id
+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_SUBSECTION "Judging answers"
 
-empathy_ambiguities()
+empathy_ambiguities_list()
 {
     curl_get_event $empathy_game_path/events game-state "-b $1" \
         | jq .ambiguities[]
@@ -532,12 +557,17 @@ empathy_ambiguities()
 
 TEST "Received all unique words"
 # echo here is to strip newlines
-result=$(echo $(empathy_ambiguities $alice))
-test "$result" = '"sun" "sand" "water" "people" "sands" "SunLight" "towels" "SunShine" "Grains of Sand" "wafer"'
+result=$(echo $(empathy_ambiguities_list $alice))
+test "$result" = '"Grains of Sand" "people" "sand" "sands" "sun" "SunLight" "SunShine" "towels" "wafer" "water"'
 TEST_END
 
+empathy_judging()
+{
+    curl_post $empathy_game_path/judging/$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_judging $alice $prompt_id '[["sun","SunLight","SunShine"],["sand","sands","Grains of Sand"],["water","wafer"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
@@ -547,11 +577,41 @@ test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit word groups from charlie"
-result=$(empathy_judging $charlie $prompt_id '[["sunlight","sunshine"],["sand","grains of sand"]]')
+result=$(empathy_judging $charlie $prompt_id '[["SunLight","SunShine"],["sand","Grains of Sand"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
+TEST_SUBSECTION "Transition from judging to scoring"
+
 empathy_scores()
+{
+    curl_get_event $empathy_game_path/events game-state "-b $1" \
+        | jq .scores
+}
+
+TEST "Scoring has not yet started"
+result=$(echo $(empathy_scores $alice))
+test "$result" = "null"
+TEST_END
+
+empathy_end_judging()
+{
+    curl_post $empathy_game_path/end-judging/$2 "" "-b $1"
+}
+
+TEST "Players vote to start scoring"
+empathy_end_judging $alice $prompt_id
+empathy_end_judging $bob $prompt_id
+empathy_end_judging $charlie $prompt_id
+test "$?" = "0"
+TEST_END
+
+TEST "Scoring has now 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,8 +621,20 @@ 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
 
+empathy_words_submitted()
+{
+    curl_get_event $empathy_game_path/events game-state "-b $1" \
+        | jq '.scores.words[].word'
+}
+
+TEST "Verify final list of words submitted"
+# echo here is to strip newlines
+result=$(echo $(empathy_words_submitted $alice))
+test "$result" = '"Grains of Sand/sand/sands" "SunLight/SunShine" "wafer/water" "people" "sun" "towels"'
+TEST_END
+
 TEST_REPORT