oreodave/big-c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modes:pair: refactor tests to utilise Rank::iter_all and Rank::cards

Browse Source
This commit is contained in:
Aryadev Chavali
2026-04-03 02:10:44 +01:00
committed by oreodave
parent 503ad53721
commit e035f53234
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/modes/pair.rs
View File

@@ -100,7 +100,7 @@ impl PartialOrd for Pair {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::card::make_decks; use crate::card::{make_decks, Rank};
fn exhaustive_pairs() -> Vec<Pair> { fn exhaustive_pairs() -> Vec<Pair> {
let deck = make_decks(1); let deck = make_decks(1);
@@ -130,15 +130,9 @@ mod tests {
// Two jokers can never be a pair. // Two jokers can never be a pair.
assert_eq!(Pair::new(Card::make_joker(), Card::make_joker()), None); assert_eq!(Pair::new(Card::make_joker(), Card::make_joker()), None);
for rank in 0..13 { for rank in Rank::iter_all() {
// Vector of cards of a rank: size 4. for c1 in rank.cards() {
let rank_cards: Vec<Card> = ((rank * 4)..((rank + 1) * 4)) for c2 in rank.cards() {
.into_iter()
.map(Card::from)
.collect();
for &c1 in &rank_cards {
for &c2 in &rank_cards {
// TEST: Pairs are composed of two similar rank cards. // TEST: Pairs are composed of two similar rank cards.
let pair = { let pair = {
let pair = Pair::new(c1, c2); let pair = Pair::new(c1, c2);
@@ -170,21 +164,15 @@ mod tests {
assert!(matches!(pair.1, Card::PlayingCard(_))); assert!(matches!(pair.1, Card::PlayingCard(_)));
} }
for opposing_rank in 0..13 { for opposing_rank in Rank::iter_all() {
if rank == opposing_rank { if rank == opposing_rank {
continue; continue;
} }
assert!(rank != opposing_rank); assert!(rank != opposing_rank);
let opposing_rank_cards: Vec<Card> = ((opposing_rank * 4)
..((opposing_rank + 1) * 4))
.into_iter()
.map(Card::from)
.collect();
// TEST: Two playing cards of differing rank can never be a pair. // TEST: Two playing cards of differing rank can never be a pair.
for &r1 in &rank_cards { for r1 in rank.cards() {
for &r2 in &opposing_rank_cards { for r2 in opposing_rank.cards() {
assert_eq!(Pair::new(r1, r2), None); assert_eq!(Pair::new(r1, r2), None);
} }
} }