Skip to content

Commit

Permalink
🐛 BUGFIX: Fix tests
Browse files Browse the repository at this point in the history 
Fixed tests to work with new changes
  • Loading branch information
@GreengagePlum
GreengagePlum committed May 14, 2023
1 parent 658474a commit 457bc46
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/test/java/me/erken/efe/chess/model/TestBishop.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ void validKingProtector() {
b.getSquare(new Coordinates(2, 4)).setPiece(p2);
King k = new King(Color.BLACK);
b.getSquare(new Coordinates(4, 2)).setPiece(k);
Assertions.assertFalse(p2.isKingProtector());
Assertions.assertFalse(p2.isRoyalProtector());
p.updateAllPositions(source, b);
p.setKingProtectorsInPath(source, b);
Assertions.assertTrue(p2.isKingProtector());
Assertions.assertTrue(p2.isRoyalProtector());
}

@Test
Expand Down
9 changes: 6 additions & 3 deletions src/test/java/me/erken/efe/chess/model/TestGame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ void complexSituationTest() {
b.clearKingsCheck();
b.clearStateSquares();
b.clearDangerSquares();
b.calculateAllPieces(Color.BLACK);
MoveHistory mh = new MoveHistory();
b.calculateAllPieces(Color.BLACK, mh);
Assertions.assertEquals(0, WB1.legalPositionsCount());
}

Expand Down Expand Up @@ -59,7 +60,8 @@ void complexSituationTest2() {
b.clearKingsCheck();
b.clearStateSquares();
b.clearDangerSquares();
b.calculateAllPieces(Color.BLACK);
MoveHistory mh = new MoveHistory();
b.calculateAllPieces(Color.BLACK, mh);
Assertions.assertEquals(0, WK.legalPositionsCount());
}

Expand All @@ -82,7 +84,8 @@ void complexSituationTest3() {
b.clearStateSquares();
b.clearDangerSquares();
b.clearPieceKingProtectors();
b.calculateAllPieces(Color.WHITE);
MoveHistory mh = new MoveHistory();
b.calculateAllPieces(Color.WHITE, mh);
Assertions.assertEquals(2, BK.legalPositionsCount());
Player p2 = new Player(Color.BLACK);
p2.makeSelection(b.getSquare(sourceBK), b);
Expand Down
34 changes: 22 additions & 12 deletions src/test/java/me/erken/efe/chess/model/TestPawn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,17 @@ void consumeFirstMove() {
void validMoveOneAheadStart() {
Board b = new Board();
Pawn p = (Pawn) b.getSquare(new Coordinates(4, 6)).getPiece();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(4, 5), b));
MoveHistory history = new MoveHistory();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(4, 5), b, history));
}

@Test
@DisplayName("Valid move two squares ahead start of game")
void validMoveTwoAheadStart() {
Board b = new Board();
Pawn p = (Pawn) b.getSquare(new Coordinates(4, 6)).getPiece();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(4, 4), b));
MoveHistory history = new MoveHistory();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(4, 4), b, history));
}

@Test
Expand All @@ -44,7 +46,8 @@ void validMoveOneAheadAfter() {
Board b = new Board();
Pawn p = (Pawn) b.getSquare(new Coordinates(4, 6)).getPiece();
p.consumeFirstMove();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(4, 5), b));
MoveHistory history = new MoveHistory();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(4, 5), b, history));
}

@Test
Expand All @@ -62,7 +65,8 @@ void validMoveDiagLeft() {
Board b = new Board();
Pawn p = (Pawn) b.getSquare(new Coordinates(4, 6)).getPiece();
b.getSquare(new Coordinates(3, 5)).setPiece(new Pawn(Color.BLACK));
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(3, 5), b));
MoveHistory history = new MoveHistory();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(3, 5), b, history));
}

@Test
Expand All @@ -71,7 +75,8 @@ void validMoveDiagRight() {
Board b = new Board();
Pawn p = (Pawn) b.getSquare(new Coordinates(4, 6)).getPiece();
b.getSquare(new Coordinates(5, 5)).setPiece(new Pawn(Color.BLACK));
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(5, 5), b));
MoveHistory history = new MoveHistory();
Assertions.assertTrue(p.isLegalPosition(new Coordinates(4, 6), new Coordinates(5, 5), b, history));
}

@Test
Expand Down Expand Up @@ -162,7 +167,8 @@ void invalidMoveSide() {
void movablePosInitial() {
Board b = new Board();
Pawn p = (Pawn) b.getSquare(new Coordinates(4, 6)).getPiece();
p.updateLegalPositions(new Coordinates(4, 6), b);
MoveHistory history = new MoveHistory();
p.updateLegalPositions(new Coordinates(4, 6), b, history);
Assertions.assertEquals(2, p.legalPositions.size());
Assertions.assertEquals(5, p.legalPositions.get(0).y);
Assertions.assertEquals(4, p.legalPositions.get(1).y);
Expand All @@ -176,7 +182,8 @@ void movablePosComplex() {
b.getSquare(new Coordinates(3, 5)).setPiece(new Pawn(Color.BLACK));
b.getSquare(new Coordinates(5, 5)).setPiece(new Pawn(Color.WHITE));
b.getSquare(new Coordinates(4, 4)).setPiece(new Pawn(Color.WHITE));
p.updateLegalPositions(new Coordinates(4, 6), b);
MoveHistory history = new MoveHistory();
p.updateLegalPositions(new Coordinates(4, 6), b, history);
Assertions.assertEquals(2, p.legalPositions.size());
Assertions.assertEquals(5, p.legalPositions.get(0).y);
Assertions.assertEquals(5, p.legalPositions.get(1).y);
Expand All @@ -191,7 +198,8 @@ void setOppositeKingToCheck() {
b.getSquare(new Coordinates(4, 0)).setPiece(null);
Coordinates source = new Coordinates(2, 6);
Assertions.assertFalse(b.getKing(Color.BLACK).isInCheck());
p.updateAllPositions(source, b);
MoveHistory history = new MoveHistory();
p.updateAllPositions(source, b, history);
Assertions.assertTrue(b.getKing(Color.BLACK).isInCheck());
}

Expand All @@ -204,11 +212,12 @@ void moveSetKingInCheck() {
b.getSquare(new Coordinates(4, 7)).setPiece(null);
Bishop p2 = new Bishop(Color.BLACK);
b.getSquare(new Coordinates(4, 2)).setPiece(p2);
MoveHistory history = new MoveHistory();
Coordinates source = new Coordinates(2, 6);
p.updateAllPositions(source, b);
p.updateAllPositions(source, b, history);
Assertions.assertEquals(2, p.legalPositions.size());
p2.updateAllPositions(new Coordinates(4, 2), b);
p.updateAllPositions(source, b);
p.updateAllPositions(source, b, history);
Assertions.assertEquals(1, p.legalPositions.size());
}

Expand All @@ -222,12 +231,13 @@ void moveSetKingProtector() {
b.getSquare(new Coordinates(4, 7)).setPiece(null);
Bishop p2 = new Bishop(Color.BLACK);
b.getSquare(new Coordinates(4, 2)).setPiece(p2);
MoveHistory history = new MoveHistory();
Coordinates source = new Coordinates(3, 3);
p.updateAllPositions(source, b);
p.updateAllPositions(source, b, history);
Assertions.assertEquals(2, p.legalPositions.size());
p2.updateAllPositions(new Coordinates(4, 2), b);
p2.setKingProtectorsInPath(new Coordinates(4, 2), b);
p.updateAllPositions(source, b);
p.updateAllPositions(source, b, history);
Assertions.assertEquals(1, p.legalPositions.size());
}

Expand Down

0 comments on commit 457bc46

Please sign in to comment.