From c327bf5ff1a999e4d387e46079a5e7af6ab5d577 Mon Sep 17 00:00:00 2001 From: Hinterberger Date: Mon, 16 Nov 2020 16:40:53 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Stage=202:=20Fehlender=20CV=20#69=20=C3=84n?= =?UTF-8?q?dern=20des=20<=3D=20auf=20ein=20>=3D=20um=20so=20einen=20Test?= =?UTF-8?q?=20auszul=C3=B6sen=20der=20fehlschl=C3=A4gt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wdg/application/validation/Base64LengthValidator.java | 2 ++ .../java/com/gepardec/wdg/challenge/ChallengeResourceTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java b/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java index 74985bf..a5bb2fa 100644 --- a/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java +++ b/src/main/java/com/gepardec/wdg/application/validation/Base64LengthValidator.java @@ -27,7 +27,9 @@ public boolean isValid(String value, ConstraintValidatorContext context) { final long length = value.length(); final long padding = calculatePadding(value); final long size = (long) ((double) length * 0.75) - padding; + //Ändern des <= auf ein >= um so einen Test auszulösen der fehlschlägt. return (size >= minLength && size <= maxLength); + //return (size >= minLength && size >= maxLength); } private long calculatePadding(String value) { diff --git a/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java b/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java index 4ed7eb4..dd25b64 100644 --- a/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java +++ b/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java @@ -7,6 +7,7 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import org.apache.http.HttpStatus; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import javax.json.bind.Jsonb; @@ -21,6 +22,7 @@ import static org.hamcrest.Matchers.equalTo; @QuarkusTest +@Disabled class ChallengeResourceTest { // use this malformed answers to test the request filters and intercept bad json body messages and avoid that json deserializer throws any error From 7e19dbd26fcb7a0b0942b92420a3da617114a5e2 Mon Sep 17 00:00:00 2001 From: agnes Date: Fri, 20 Nov 2020 12:46:38 +0100 Subject: [PATCH 2/3] =?UTF-8?q?REGEX=20f=C3=BCr=20Base64ValidatorTest=20ma?= =?UTF-8?q?nipuliert=20und=20@WINStage=20Kommentar=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gepardec/wdg/application/validation/Base64Validator.java | 2 +- .../wdg/application/validation/Base64ValidatorTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java b/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java index 714dce9..0d6da64 100644 --- a/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java +++ b/src/main/java/com/gepardec/wdg/application/validation/Base64Validator.java @@ -12,7 +12,7 @@ public class Base64Validator implements ConstraintValidator { /** * Base64 validation regular expression. */ - private static final Pattern BASE64_PATTERN = Pattern.compile("^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$"); + private static final Pattern BASE64_PATTERN = Pattern.compile("^([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{4}|[A-Ga-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==)?$"); @Override public boolean isValid(String value, ConstraintValidatorContext context) { diff --git a/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java b/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java index 53d466f..76ac2f1 100644 --- a/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java +++ b/src/test/java/com/gepardec/wdg/application/validation/Base64ValidatorTest.java @@ -37,7 +37,7 @@ void isValid_withPadding0_thenTrue() { final String base64 = createBase64StringForPadding(0); Assertions.assertTrue(validator.isValid(base64, null)); } - + //@WINStage2: Test isValid_withPadding1_thenTruealse() will fail because of a broken CodePart @Test void isValid_withPadding1_thenTruealse() { final String base64 = createBase64StringForPadding(1); From 5833fb324797a96fa4120d0b0e08e222dcb8ad12 Mon Sep 17 00:00:00 2001 From: philzelinger <57404963+philzelinger@users.noreply.github.com> Date: Fri, 18 Dec 2020 10:51:30 +0100 Subject: [PATCH 3/3] Update ChallengeResourceTest.java Nicht notwendig zu disablen --- .../java/com/gepardec/wdg/challenge/ChallengeResourceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java b/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java index dd25b64..4ed7eb4 100644 --- a/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java +++ b/src/test/java/com/gepardec/wdg/challenge/ChallengeResourceTest.java @@ -7,7 +7,6 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import org.apache.http.HttpStatus; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import javax.json.bind.Jsonb; @@ -22,7 +21,6 @@ import static org.hamcrest.Matchers.equalTo; @QuarkusTest -@Disabled class ChallengeResourceTest { // use this malformed answers to test the request filters and intercept bad json body messages and avoid that json deserializer throws any error