From 2ee4adc8075bffdd560ff05a3c8772912d728700 Mon Sep 17 00:00:00 2001 From: Julius Dewender Date: Thu, 14 Jan 2021 22:41:22 +0100 Subject: [PATCH] figure movement test: white rook valid down --- fh.fd.ci.client/src/main/java/de/fd/fh/Figure.java | 7 ------- fh.fd.ci.client/src/main/java/de/fd/fh/FigureFarmer.java | 5 +++++ fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java | 7 +++++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fh.fd.ci.client/src/main/java/de/fd/fh/Figure.java b/fh.fd.ci.client/src/main/java/de/fd/fh/Figure.java index 265338f..d592c94 100644 --- a/fh.fd.ci.client/src/main/java/de/fd/fh/Figure.java +++ b/fh.fd.ci.client/src/main/java/de/fd/fh/Figure.java @@ -16,13 +16,6 @@ public class Figure return false; } - int stepSize = src / fieldLength - dst / fieldLength; // hoch/runter - - if (stepSize <= 0) // weißer Bauer kein Schritt "runter" - { - return false; - } - return true; } } diff --git a/fh.fd.ci.client/src/main/java/de/fd/fh/FigureFarmer.java b/fh.fd.ci.client/src/main/java/de/fd/fh/FigureFarmer.java index ddddd9a..1c21b0b 100644 --- a/fh.fd.ci.client/src/main/java/de/fd/fh/FigureFarmer.java +++ b/fh.fd.ci.client/src/main/java/de/fd/fh/FigureFarmer.java @@ -12,6 +12,11 @@ public class FigureFarmer extends Figure return false; } + if (stepSize <= 0) // weißer Bauer kein Schritt "runter" + { + return false; + } + return super.moveAllowed(src, dst, field); } } diff --git a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java index 28b74b0..da24316 100644 --- a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java +++ b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureTest.java @@ -77,4 +77,11 @@ class FigureTest Figure f = new Figure(); assertTrue(f.moveAllowed(Figure.fieldLength * 4 + 4, Figure.fieldLength * 0 + 4, new int[Figure.fieldLength * Figure.fieldLength])); } + + @Test + void whiteRookValidMoveDown() + { + Figure f = new Figure(); + assertTrue(f.moveAllowed(Figure.fieldLength * 4 + 4, Figure.fieldLength * 7 + 4, new int[Figure.fieldLength * Figure.fieldLength])); + } } \ No newline at end of file