fix logic in OneMoveForwardHandler class and TwoMovesForwardHandler c…

…lass to move within a fixed column

src/handlers/EnemyOnDestinationHandler.java

@@ -0,0 +1,2 @@
+package handlers;public class EnemyOnDestinationHandler {
+}

src/handlers/LeftSquareDiagonallyHandler.java

@@ -0,0 +1,2 @@
+package handlers;public class LeftSquareDiagonallyHandler {
+}

src/handlers/OneMoveForwardHandler.java

@@ -7,9 +7,13 @@
 public class OneMoveForwardHandler extends BaseHandler {
     @Override
     protected boolean isValid(Board board, Square from, Square to) {
-        if (board.getPieceAt(from).getOwner().getColor() == Color.BLACK) {
-            return to.getRow() == from.getRow() - 1;
+        boolean result = to.getColumn() == from.getColumn();
+        if (board.getPieceAt(from).getOwner().getColor() == Color.WHITE) {
+            result = result && to.getRow() == from.getRow() + 1;
+        } else {
+            result = result && to.getRow() == from.getRow() - 1;
         }
-        return to.getRow() == from.getRow() + 1;
+
+        return result;
     }
 }

src/handlers/RightSquareDiagonallyHandler.java

@@ -0,0 +1,2 @@
+package handlers;public class RightSquareDiagonallyHandler {
+}

src/handlers/TwoMovesForwardHandler.java

@@ -7,9 +7,13 @@
 public class TwoMovesForwardHandler extends BaseHandler {
     @Override
     protected boolean isValid(Board board, Square from, Square to) {
-        if (board.getPieceAt(from).getOwner().getColor() == Color.BLACK) {
-            return to.getRow() == from.getRow() - 2;
+        boolean result = to.getColumn() == from.getColumn();
+        if (board.getPieceAt(from).getOwner().getColor() == Color.WHITE) {
+            result = result && to.getRow() == from.getRow() + 2;
+        } else {
+            result = result && to.getRow() == from.getRow() - 2;
         }
-        return to.getRow() == from.getRow() + 2;
+
+        return result;
     }
 }

src/movements/LeftSquareDiagonallyIfEnemyExistsStrategy.java

@@ -0,0 +1,24 @@
+package movements;
+
+import board.Board;
+import general.Square;
+import handlers.*;
+
+public class LeftSquareDiagonallyIfEnemyExists extends BaseHandler {
+    @Override
+    protected boolean isValid(Board board, Square from, Square to) {
+        if (board == null || from == null || to == null) {
+            throw new IllegalArgumentException("NullPointer argument");
+        }
+
+        BaseHandler handler1 = new ValidStartLocationHandler();
+        BaseHandler handler2 = new ValidDestinationHandler();
+        BaseHandler handler3 = new LeftSquareDiagonallyHandler();
+        BaseHandler handler4 = new EnemyOnDestinationHandler();
+        handler1.setNext(handler2);
+        handler2.setNext(handler3);
+        handler3.setNext(handler4);
+
+        return handler1.canHandle(board, from, to);
+    }
+}

src/movements/RightSquareDiagonallyIfEnemyExistsStrategy.java

@@ -0,0 +1,2 @@
+package movements;public class RightSquareDiagonallyIfEnemyExists {
+}