X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test;h=667d6ac380346619c4c1a6d7e38499f5a48bce7b;hb=325a886a5d84c42c67e7075c734b74619d383ea2;hp=26a57707a6637ab94a8ec3927087646b18e1b074;hpb=8fb1176fb345a5a76610bb79192fa1e84496c08c;p=lmno-server

diff --git a/test b/test
index 26a5770..667d6ac 100755
--- a/test
+++ b/test
@@ -461,7 +461,7 @@ empathy_submit_prompt()
 }
 
 TEST "Submit a category"
-prompt_id=$(empathy_submit_prompt $alice 3 "3 things on a beach" | jq .id)
+prompt_id=$(empathy_submit_prompt $alice 4 "4 things on a beach" | jq .id)
 test "$prompt_id" = "1"
 TEST_END
 
@@ -493,22 +493,22 @@ empathy_answer()
 TEST_SUBSECTION "Submitting answers"
 
 TEST "Submit from a non-player fails"
-result=$(empathy_answer bogus $prompt_id '"sun", "sand", "water"')
+result=$(empathy_answer bogus $prompt_id '"sun", "sand", "water", "people"')
 test "$result" = '{"valid":false,"message":"Player not found"}'
 TEST_END
 
 TEST "Submit from alice succeeds"
-result=$(empathy_answer $alice $prompt_id '"sun", "sand", "water"')
+result=$(empathy_answer $alice $prompt_id '"sun", "sand", "water", "people"')
 test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit from bob succeeds"
-result=$(empathy_answer $bob $prompt_id '"people", "sands", "sunlight"')
+result=$(empathy_answer $bob $prompt_id '"sand", "sands", "sunlight", "towels"')
 test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit from charlie succeeds"
-result=$(empathy_answer $charlie $prompt_id '"sunshine", "sand", "wafer"')
+result=$(empathy_answer $charlie $prompt_id '"sunshine", "grains of sand", "wafer", "people"')
 test "$result" = '{"valid":true}'
 TEST_END
 
@@ -522,28 +522,42 @@ TEST_SUBSECTION "Judging answers"
 empathy_ambiguities()
 {
     curl_get_event $empathy_game_path/events game-state "-b $1" \
-        | jq -r .ambiguities[]
+        | jq .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 sunshine wafer"
+test "$result" = '"sun" "sand" "water" "people" "sands" "sunlight" "towels" "sunshine" "grains of sand" "wafer"'
 TEST_END
 
 TEST "Submit word groups from alice"
-result=$(empathy_judging $alice $prompt_id '[["sun","sunlight","sunshine"],["sand","sands"],["water","wafer"]]')
+result=$(empathy_judging $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 '[["sand","sands"],["water","wafer"]]')
+result=$(empathy_judging $bob $prompt_id '[["sands","grains of sand"],["water","wafer"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
 TEST "Submit word groups from charlie"
-result=$(empathy_judging $charlie $prompt_id '[["sunlight","sunshine"],["sand","sands"]]')
+result=$(empathy_judging $charlie $prompt_id '[["sunlight","sunshine"],["sand","grains of sand"]]')
 test "$result" = '{"valid":true}'
 TEST_END
 
+empathy_scores()
+{
+    curl_get_event $empathy_game_path/events game-state "-b $1" \
+        | jq '.scores.scores[]|.player,.score'
+}
+
+TEST_SUBSECTION "Scoring"
+
+TEST "Verify final scores as expected"
+# echo here is to strip newlines
+result=$(echo $(empathy_scores $alice))
+test "$result" = '"charlie" 9 "alice" 8 "bob" 6'
+TEST_END
+
 TEST_REPORT