From 7734e50a439fea29aa7de2758cb82204619d171c Mon Sep 17 00:00:00 2001 From: Julius Dewender Date: Sun, 31 Jan 2021 17:48:44 +0100 Subject: [PATCH] added test for invalid movement of black farmer --- .../test/java/de/fd/fh/FigureFarmerTest.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java index bb441ea..b51688d 100644 --- a/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java +++ b/fh.fd.ci.client/src/test/java/de/fd/fh/FigureFarmerTest.java @@ -38,17 +38,29 @@ class FigureFarmerTest } @ParameterizedTest - // row (src), col (src), row (dst), col (dst) + // color (0 white/1 black), row (src), col (src), row (dst), col (dst) @CsvSource({ - "6, 0, 7, 0", // a2 -> a1 - "4, 4, 5, 4" // e4 -> e3 + "0, 6, 0, 7, 0", // white: a2 -> a1 + "0, 4, 4, 5, 4", // white: e4 -> e3 + + "1, 1, 0, 0, 0" // black: a7 -> a8 }) - void farmerInvalidDestinationDown(int srcRow, int srcCol, int dstRow, int dstCol) // statt nach "oben" wird nach "unten" gegangen + void farmerInvalidDestinationDown(int color, int srcRow, int srcCol, int dstRow, int dstCol) // statt nach "oben" wird nach "unten" gegangen { int src = Figure.fieldLength * srcRow + srcCol; int dst = Figure.fieldLength * dstRow + dstCol; - Figure f = new FigureFarmer(FigureFarmer.Color.White); + Figure f = null; + + if (color == 0) + { + f = new FigureFarmer(FigureFarmer.Color.White); + } + else if (color == 1) + { + f = new FigureFarmer(FigureFarmer.Color.Black); + } + assertFalse(f.moveAllowed(src, dst, field)); }