From 50da0cab470b2ae3d7be040d6621518c73c8f64b Mon Sep 17 00:00:00 2001
From: Martin <ms618@hdm-stuttgart.de>
Date: Mon, 26 Feb 2024 13:28:42 +0100
Subject: [PATCH] Well done, team! Update: Parser.java (fixed parser for player
statistics verification) Update: ParserTest.java (changed playerStats test
according to changes in parser)
---
.../Model/DataStorage/Classes/Utilities/Parser.java | 6 +++---
.../DataStorage/Classes/Utilities/ParserTest.java | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java
index c207fa95..280cfe87 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/Parser.java
@@ -32,7 +32,7 @@ public class Parser {
Matcher mat = pat.matcher(username);
boolean result = mat.find();
if (result) {
- throw new ParserException("Forbidden characters used! Only user letters A-Z or numbers 0-9 or symbols '-' or '_' !");
+ throw new ParserException("Forbidden characters used! Only use letters A-Z or numbers 0-9 or symbols '-' or '_' !");
}
}
@@ -51,7 +51,7 @@ public class Parser {
Matcher mat = pat.matcher(password);
boolean result = mat.find();
if (result) {
- throw new ParserException("Forbidden characters used! Only user letters A-Z or numbers 0-9 or symbols '-' or '_' !");
+ throw new ParserException("Forbidden characters used! Only use letters A-Z or numbers 0-9 or symbols '-' or '_' !");
}
}
@@ -70,7 +70,7 @@ public class Parser {
Matcher mat = pat.matcher(mapName);
boolean result = mat.find();
if (result) {
- throw new ParserException("Forbidden characters used! Only user letters A-Z or numbers 0-9 or symbols '-' or '_' !");
+ throw new ParserException("Forbidden characters used! Only use letters A-Z or numbers 0-9 or symbols '-' or '_' !");
}
}
diff --git a/src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java b/src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java
index 6129c434..980f0054 100644
--- a/src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java
+++ b/src/test/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/Utilities/ParserTest.java
@@ -26,7 +26,7 @@ class ParserTest {
assertTrue(testMe.getMessage().contains("Username too long! Max length is 40 characters."));
testMe = assertThrows(ParserException.class, () -> Parser.usernameValid("SELECT * FROM"));
- assertTrue(testMe.getMessage().contains("Forbidden characters used! Only user letters A-Z or numbers 0-9 or symbols '-' or '_' !"));
+ assertTrue(testMe.getMessage().contains("Forbidden characters used! Only use letters A-Z or numbers 0-9 or symbols '-' or '_' !"));
}
@ParameterizedTest
@@ -46,7 +46,7 @@ class ParserTest {
assertTrue(testMe.getMessage().contains("Password too long! Max length is 40 characters."));
testMe = assertThrows(ParserException.class, () -> Parser.passwordValid("SELECT * FROM"));
- assertTrue(testMe.getMessage().contains("Forbidden characters used! Only user letters A-Z or numbers 0-9 or symbols '-' or '_' !"));
+ assertTrue(testMe.getMessage().contains("Forbidden characters used! Only use letters A-Z or numbers 0-9 or symbols '-' or '_' !"));
}
@ParameterizedTest
@@ -66,7 +66,7 @@ class ParserTest {
assertTrue(testMe.getMessage().contains("Map-Name too long! Max length is 30 characters."));
testMe = assertThrows(ParserException.class, () -> Parser.mapNameValid("SELECT * FROM"));
- assertTrue(testMe.getMessage().contains("Forbidden characters used! Only user letters A-Z or numbers 0-9 or symbols '-' or '_' !"));
+ assertTrue(testMe.getMessage().contains("Forbidden characters used! Only use letters A-Z or numbers 0-9 or symbols '-' or '_' !"));
}
@ParameterizedTest
@@ -232,10 +232,10 @@ class ParserTest {
@Test
void statsInvalid(){
- ParserException testMe = assertThrows(ParserException.class, () -> Parser.playerStatsValid(new PlayerStatistics(-1, 0, 0, 0, 0, 0)));
+ ParserException testMe = assertThrows(ParserException.class, () -> Parser.playerStatsValid(new PlayerStatistics(0, -1, 0, 0, 0, 0)));
assertTrue(testMe.getMessage().contains("Player statistics data corrupted - Minimum value for lost games is 0!"));
- testMe = assertThrows(ParserException.class, () -> Parser.playerStatsValid(new PlayerStatistics(0, -1, 0, 0, 0, 0)));
+ testMe = assertThrows(ParserException.class, () -> Parser.playerStatsValid(new PlayerStatistics(-1, 0, 0, 0, 0, 0)));
assertTrue(testMe.getMessage().contains("Player statistics data corrupted - Minimum value for won games is 0!"));
testMe = assertThrows(ParserException.class, () -> Parser.playerStatsValid(new PlayerStatistics(0, 0, -1, 0, 0, 0)));
--
GitLab