diff --git a/board/src/lib.rs b/board/src/lib.rs index 44d142c..f849d54 100644 --- a/board/src/lib.rs +++ b/board/src/lib.rs @@ -6,9 +6,6 @@ pub mod piece; pub mod position; mod square; -#[cfg(test)] -mod tests; - pub use moves::Move; pub use position::Position; pub use square::{File, Rank, Square}; diff --git a/board/src/moves/king.rs b/board/src/moves/king.rs index d1c7287..abf345d 100644 --- a/board/src/moves/king.rs +++ b/board/src/moves/king.rs @@ -181,14 +181,14 @@ mod tests { ); let expected_moves = [ - Move::new(Piece::king(Color::White), Square::e4(), Square::d5()), - Move::new(Piece::king(Color::White), Square::e4(), Square::e5()), - Move::new(Piece::king(Color::White), Square::e4(), Square::f5()), - Move::new(Piece::king(Color::White), Square::e4(), Square::f4()), - Move::new(Piece::king(Color::White), Square::e4(), Square::f3()), - Move::new(Piece::king(Color::White), Square::e4(), Square::e3()), - Move::new(Piece::king(Color::White), Square::e4(), Square::d3()), - Move::new(Piece::king(Color::White), Square::e4(), Square::d4()), + Move::new(Piece::king(Color::White), Square::E4, Square::D5), + Move::new(Piece::king(Color::White), Square::E4, Square::E5), + Move::new(Piece::king(Color::White), Square::E4, Square::F5), + Move::new(Piece::king(Color::White), Square::E4, Square::F4), + Move::new(Piece::king(Color::White), Square::E4, Square::F3), + Move::new(Piece::king(Color::White), Square::E4, Square::E3), + Move::new(Piece::king(Color::White), Square::E4, Square::D3), + Move::new(Piece::king(Color::White), Square::E4, Square::D4), ]; let mut generated_moves: HashSet = generator.iter().cloned().collect(); @@ -225,9 +225,9 @@ mod tests { ); let expected_moves = [ - Move::new(Piece::king(Color::White), Square::a1(), Square::a2()), - Move::new(Piece::king(Color::White), Square::a1(), Square::b1()), - Move::new(Piece::king(Color::White), Square::a1(), Square::b2()), + Move::new(Piece::king(Color::White), Square::A1, Square::A2), + Move::new(Piece::king(Color::White), Square::A1, Square::B1), + Move::new(Piece::king(Color::White), Square::A1, Square::B2), ]; let mut generated_moves: HashSet = generator.iter().cloned().collect(); diff --git a/board/src/moves/knight.rs b/board/src/moves/knight.rs index 683b930..01711c8 100644 --- a/board/src/moves/knight.rs +++ b/board/src/moves/knight.rs @@ -113,14 +113,14 @@ mod tests { */ let expected_moves = [ - Move::new(Piece::knight(Color::White), Square::e4(), Square::c3()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::d2()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::f2()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::g3()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::c5()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::d6()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::g5()), - Move::new(Piece::knight(Color::White), Square::e4(), Square::f6()), + Move::new(Piece::knight(Color::White), Square::E4, Square::C3), + Move::new(Piece::knight(Color::White), Square::E4, Square::D2), + Move::new(Piece::knight(Color::White), Square::E4, Square::F2), + Move::new(Piece::knight(Color::White), Square::E4, Square::G3), + Move::new(Piece::knight(Color::White), Square::E4, Square::C5), + Move::new(Piece::knight(Color::White), Square::E4, Square::D6), + Move::new(Piece::knight(Color::White), Square::E4, Square::G5), + Move::new(Piece::knight(Color::White), Square::E4, Square::F6), ]; let mut generated_moves: HashSet = generator.iter().cloned().collect(); diff --git a/board/src/moves/pawn.rs b/board/src/moves/pawn.rs index 23b31f1..118ef8b 100644 --- a/board/src/moves/pawn.rs +++ b/board/src/moves/pawn.rs @@ -262,8 +262,8 @@ mod tests { let expected_moves = HashSet::from_iter( [ - Move::new(Piece::pawn(Color::White), Square::e2(), Square::e3()), - Move::new(Piece::pawn(Color::White), Square::e2(), Square::e4()), + Move::new(Piece::pawn(Color::White), Square::E2, Square::E3), + Move::new(Piece::pawn(Color::White), Square::E2, Square::E4), ] .into_iter(), ); @@ -283,12 +283,7 @@ mod tests { let generator = PawnMoveGenerator::new(&pos, Color::White); let expected_moves = HashSet::from_iter( - [Move::new( - Piece::pawn(Color::White), - Square::e3(), - Square::e4(), - )] - .into_iter(), + [Move::new(Piece::pawn(Color::White), Square::E3, Square::E4)].into_iter(), ); let generated_moves: HashSet = generator.collect(); @@ -310,12 +305,7 @@ mod tests { let generator = PawnMoveGenerator::new(&pos, Color::White); let expected_moves = HashSet::from_iter( - [Move::new( - Piece::pawn(Color::White), - Square::e2(), - Square::e3(), - )] - .into_iter(), + [Move::new(Piece::pawn(Color::White), Square::E2, Square::E3)].into_iter(), ); let generated_moves: HashSet = generator.collect(); @@ -356,10 +346,8 @@ mod tests { let generator = PawnMoveGenerator::new(&pos, Color::White); let expected_moves = HashSet::from_iter( - [ - Move::new(Piece::pawn(Color::White), Square::e4(), Square::d5()) - .capturing(PlacedPiece::new(Piece::knight(Color::Black), Square::d5())), - ] + [Move::new(Piece::pawn(Color::White), Square::E4, Square::D5) + .capturing(PlacedPiece::new(Piece::knight(Color::Black), Square::D5))] .into_iter(), ); @@ -386,10 +374,10 @@ mod tests { let expected_moves = HashSet::from_iter( [ - Move::new(Piece::pawn(Color::White), Square::e4(), Square::d5()) - .capturing(PlacedPiece::new(Piece::knight(Color::Black), Square::d5())), - Move::new(Piece::pawn(Color::White), Square::e4(), Square::f5()) - .capturing(PlacedPiece::new(Piece::queen(Color::Black), Square::f5())), + Move::new(Piece::pawn(Color::White), Square::E4, Square::D5) + .capturing(PlacedPiece::new(Piece::knight(Color::Black), Square::D5)), + Move::new(Piece::pawn(Color::White), Square::E4, Square::F5) + .capturing(PlacedPiece::new(Piece::queen(Color::Black), Square::F5)), ] .into_iter(), ); diff --git a/board/src/position/position.rs b/board/src/position/position.rs index e22925e..f1d2b06 100644 --- a/board/src/position/position.rs +++ b/board/src/position/position.rs @@ -180,7 +180,7 @@ mod tests { let mut position = Position::empty(); let piece = Piece::new(Color::White, Shape::Queen); - let square = Square::e4(); + let square = Square::E4; position .place_piece(piece, square) diff --git a/board/src/square.rs b/board/src/square.rs index 8dfb5b7..d4c93e9 100644 --- a/board/src/square.rs +++ b/board/src/square.rs @@ -323,8 +323,8 @@ mod tests { #[test] fn display() { - assert_eq!(format!("{}", Square::c5()), "c5"); - assert_eq!(format!("{}", Square::a1()), "a1"); - assert_eq!(format!("{}", Square::h8()), "h8"); + assert_eq!(format!("{}", Square::C5), "c5"); + assert_eq!(format!("{}", Square::A1), "a1"); + assert_eq!(format!("{}", Square::H8), "h8"); } } diff --git a/board/src/tests.rs b/board/src/tests.rs deleted file mode 100644 index 1bc0085..0000000 --- a/board/src/tests.rs +++ /dev/null @@ -1,40 +0,0 @@ -// Eryn Wells - -/// Test helper utilities. -use crate::Square; - -/// A constructor function that returns a Square representing the square on the -/// chessboard indicated by the algebraic notation. -macro_rules! sq_constructor { - ($func_name:ident) => { - pub(crate) fn $func_name() -> Square { - Square::from_algebraic_str(stringify!($func_name)).expect(stringify!($func_name)) - } - }; -} - -impl Square { - sq_constructor!(a1); - sq_constructor!(a2); - sq_constructor!(b1); - sq_constructor!(b2); - sq_constructor!(c3); - sq_constructor!(c5); - sq_constructor!(d2); - sq_constructor!(d3); - sq_constructor!(d4); - sq_constructor!(d5); - sq_constructor!(d6); - sq_constructor!(e2); - sq_constructor!(e3); - sq_constructor!(e4); - sq_constructor!(e5); - sq_constructor!(f2); - sq_constructor!(f3); - sq_constructor!(f4); - sq_constructor!(f5); - sq_constructor!(f6); - sq_constructor!(g3); - sq_constructor!(g5); - sq_constructor!(h8); -}