v1.1.0: highlight winning symbols on the slots board

1 files changed, 29 insertions, 14 deletions

diff --git a/tests/slots.rs b/tests/slots.rs
index 5fb751a..857e607 100644
--- a/tests/slots.rs
+++ b/tests/slots.rs
@@ -1,6 +1,6 @@
 //! Regression tests for the server-side 5x3 slots game.
 
-use zagan_bet::server::games::slots::{SlotsGame, PAYLINES, REELS, ROWS};
+use zagan_bet::server::games::slots::{LineWin, SlotsGame, PAYLINES, REELS, ROWS};
 use zagan_bet::server::games::traits::{Game, GamePhase};
 
 /// Convert row-major test rows into the column-major wire format.
@@ -15,13 +15,17 @@ fn grid(rows: [&str; 3]) -> String {
     result
 }
 
-fn payout(rows: [&str; 3], bet: u64) -> (u64, Vec<usize>) {
+fn payout(rows: [&str; 3], bet: u64) -> (u64, Vec<LineWin>) {
     let reels = grid(rows);
     let game = SlotsGame::with_grid(&reels);
     let cells: Vec<char> = reels.chars().collect();
     game.calculate_payout(&cells, bet)
 }
 
+fn lines(wins: &[LineWin]) -> Vec<usize> {
+    wins.iter().map(|win| win.line).collect()
+}
+
 #[test]
 fn the_wire_grid_is_five_reels_by_three_rows() {
     assert_eq!(REELS, 5);
@@ -37,50 +41,60 @@ fn the_wire_grid_is_five_reels_by_three_rows() {
 
 #[test]
 fn three_of_a_kind_on_the_top_line_pays() {
-    let (winnings, lines) = payout(["CCCDD", "CLLGG", "CLOSS"], 10);
+    let (winnings, wins) = payout(["CCCDD", "CLLGG", "CLOSS"], 10);
 
     assert_eq!(winnings, 20, "CCC on line 1 pays 2x total bet");
-    assert_eq!(lines, vec![1]);
+    assert_eq!(lines(&wins), vec![1]);
+    assert_eq!(wins[0].cells, vec![0, 3, 6]);
 }
 
 #[test]
 fn four_of_a_kind_pays_more_than_three() {
-    let (winnings, lines) = payout(["CCCCD", "LOGDS", "OGDSL"], 10);
+    let (winnings, wins) = payout(["CCCCD", "LOGDS", "OGDSL"], 10);
 
     assert_eq!(winnings, 50, "CCCC pays 5x total bet");
-    assert_eq!(lines, vec![1]);
+    assert_eq!(lines(&wins), vec![1]);
+    assert_eq!(wins[0].cells, vec![0, 3, 6, 9]);
 }
 
 #[test]
 fn five_of_a_kind_pays_all_lines() {
-    let (winnings, lines) = payout(["SSSSS", "SSSSS", "SSSSS"], 10);
+    let (winnings, wins) = payout(["SSSSS", "SSSSS", "SSSSS"], 10);
 
     assert_eq!(winnings, 7500, "five SSSSS lines at 150x each");
-    assert_eq!(lines, vec![1, 2, 3, 4, 5]);
+    assert_eq!(lines(&wins), vec![1, 2, 3, 4, 5]);
+    assert_eq!(wins[0].cells, vec![0, 3, 6, 9, 12]);
+    assert_eq!(wins[3].cells, vec![0, 4, 8, 10, 12]);
+    assert_eq!(wins[4].cells, vec![2, 4, 6, 10, 14]);
 }
 
 #[test]
 fn the_v_payline_is_evaluated() {
-    let (winnings, lines) = payout(["COGDC", "LCLCG", "OGCSD"], 10);
+    let (winnings, wins) = payout(["COGDC", "LCLCG", "OGCSD"], 10);
 
     assert_eq!(winnings, 150, "V line with five C symbols pays 15x");
-    assert_eq!(lines, vec![4]);
+    assert_eq!(lines(&wins), vec![4]);
+    assert_eq!(wins[0].cells, vec![0, 4, 8, 10, 12]);
 }
 
 #[test]
 fn no_matching_line_pays_nothing() {
-    let (winnings, lines) = payout(["CLOGD", "LOSGC", "DGDSC"], 100);
+    let (winnings, wins) = payout(["CLOGD", "LOSGC", "DGDSC"], 100);
 
     assert_eq!(winnings, 0);
-    assert!(lines.is_empty());
+    assert!(wins.is_empty());
 }
 
 #[test]
 fn winning_lines_are_added_together() {
-    let (winnings, lines) = payout(["SSSSS", "LLLLL", "OOOOO"], 10);
+    let (winnings, wins) = payout(["SSSSS", "LLLLL", "OOOOO"], 10);
 
     assert_eq!(winnings, (150 + 20 + 25) * 10);
-    assert_eq!(lines, vec![1, 2, 3]);
+    assert_eq!(lines(&wins), vec![1, 2, 3]);
+
+    let mut cells: Vec<usize> = wins.iter().flat_map(|win| win.cells.clone()).collect();
+    cells.sort_unstable();
+    assert_eq!(cells, (0..15).collect::<Vec<_>>());
 }
 
 #[test]
@@ -111,6 +125,7 @@ fn a_spin_produces_a_finished_state_and_a_result_with_win_lines() {
     assert_eq!(result.winnings, 20);
     assert_eq!(result.result_data.get("win_type").unwrap(), "win");
     assert_eq!(result.result_data.get("win_lines").unwrap(), "1");
+    assert_eq!(result.result_data.get("win_cells").unwrap(), "0,3,6");
 }
 
 #[test]