Two alterations to player scoring: per-round grouping, and round normalization

[lmno-server] / test

diff --git a/test b/test
index f62d6824315253edd01758f443ca946a393e2947..fcb556c5baa4e11c1ed1ab3eeaf216bb54c3f1da 100755 (executable)
--- a/test
+++ b/test
@@ -690,7 +690,7 @@ TEST_END
 # Usage: empathy_scores_names_numbers <player_name>
 empathy_scores_names_numbers()
 {
-    empathy_get_event $1 game-state | jq '.scores.scores[]|.player,.score'
+    empathy_get_event $1 game-state | jq '.scores.scores[]|.players[],.score'
 }
 
 TEST_SUBSECTION "Scoring"
@@ -890,7 +890,7 @@ 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 "$result" = '"alice" "bob" 2 "charlie" "dale" "eric" "fred" 0'
 TEST_END
 
 echo ""
@@ -929,7 +929,7 @@ 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 "$result" = '"alice" "bob" 1 "charlie" 0'
 TEST_END
 
 TEST_SUBSECTION "Deactivated players don't block future game phase advances"