University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

Style: Apply Spotless

Browse Source
This commit is contained in:
Mathis Ginkel
2026-05-10 16:49:15 +02:00
parent 351ac06aab
commit 47475dc4d3
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
+1 -2
View File
@@ -247,8 +247,7 @@ public class ClientService {
// Allow primitive values to contain hyphens (UUIDs) in addition to // Allow primitive values to contain hyphens (UUIDs) in addition to
// digits/words/colons // digits/words/colons
static Pattern responseRex = static Pattern responseRex =
Pattern.compile( Pattern.compile("(?<key>\\w+)=(('(?<string>([^']|\\')+)')|(?<primVal>[^ ]+))");
"(?<key>\\w+)=(('(?<string>([^']|\\')+)')|(?<primVal>[^ ]+))");
/** /**
* Removes escape characters from a string, specifically converting escaped single quotes (\') * Removes escape characters from a string, specifically converting escaped single quotes (\')
src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientServiceTest.java
+18 -14
View File
@@ -1,24 +1,25 @@
package ch.unibas.dmi.dbis.cs108.casono.client.network; package ch.unibas.dmi.dbis.cs108.casono.client.network;
import static org.junit.jupiter.api.Assertions.assertEquals;
import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter; import ch.unibas.dmi.dbis.cs108.casono.server.network.command.parsing.RequestParameter;
import java.util.*;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class ClientServiceTest { public class ClientServiceTest {
@Test @Test
public void parsingResponse() { public void parsingResponse() {
ArrayList<RequestParameter> params = new ArrayList<>(); ArrayList<RequestParameter> params = new ArrayList<>();
params.add(new RequestParameter("KEY", "VALUE")); params.add(new RequestParameter("KEY", "VALUE"));
params.add(new RequestParameter("STANDARD_TEXT", "Lorem ipsum dolor sit amet, consectetur adipiscing elit")); params.add(
new RequestParameter(
"STANDARD_TEXT",
"Lorem ipsum dolor sit amet, consectetur adipiscing elit"));
params.add(new RequestParameter("TEXT_BASED_EMOJI_WITHOUT_QUOTATION_MARKS", ";-)")); params.add(new RequestParameter("TEXT_BASED_EMOJI_WITHOUT_QUOTATION_MARKS", ";-)"));
params.add(new RequestParameter("TEXT_WITH_QUOTATION_MARKS", "SOMEBODY SAYS: 'HALLO WELT'")); params.add(
new RequestParameter("TEXT_WITH_QUOTATION_MARKS", "SOMEBODY SAYS: 'HALLO WELT'"));
params.add(new RequestParameter("NUMBERS", "123456789")); params.add(new RequestParameter("NUMBERS", "123456789"));
params.add(new RequestParameter("SOME_SPECIAL_CHARACTERS", "°^!§$%&/()=[]}?*+~'#`")); params.add(new RequestParameter("SOME_SPECIAL_CHARACTERS", "°^!§$%&/()=[]}?*+~'#`"));
params.add(new RequestParameter("WRONG_CHARACTERS", "# * ~ +")); params.add(new RequestParameter("WRONG_CHARACTERS", "# * ~ +"));
@@ -27,18 +28,21 @@ public class ClientServiceTest {
ArrayList<String> paramsAsResponseLines = new ArrayList<>(); ArrayList<String> paramsAsResponseLines = new ArrayList<>();
for (RequestParameter parameter : params) { for (RequestParameter parameter : params) {
if (!parameter.key().equals("WRONG_TEXT") && !parameter.key().equals("WRONG_CHARACTERS") && parameter.value().contains(" ")) { if (!parameter.key().equals("WRONG_TEXT")
&& !parameter.key().equals("WRONG_CHARACTERS")
&& parameter.value().contains(" ")) {
String newValue = "'" + parameter.value() + "'"; String newValue = "'" + parameter.value() + "'";
paramsAsResponseLines.add(String.format("%s=%s", parameter.key(), newValue)); paramsAsResponseLines.add(String.format("%s=%s", parameter.key(), newValue));
} else { } else {
paramsAsResponseLines.add(String.format("%s=%s", parameter.key(), parameter.value())); paramsAsResponseLines.add(
String.format("%s=%s", parameter.key(), parameter.value()));
} }
} }
assertEquals(8, paramsAsResponseLines.size()); assertEquals(8, paramsAsResponseLines.size());
List<RequestParameter> msgRes =
List<RequestParameter> msgRes = new ArrayList<>(ClientService.convertToRequestParameters(paramsAsResponseLines)); new ArrayList<>(ClientService.convertToRequestParameters(paramsAsResponseLines));
assertEquals(6, msgRes.size()); assertEquals(6, msgRes.size());
@@ -46,7 +50,7 @@ public class ClientServiceTest {
assertEquals(params.get(i), msgRes.get(i)); assertEquals(params.get(i), msgRes.get(i));
} }
assert(!msgRes.contains(params.get(6))); assert (!msgRes.contains(params.get(6)));
assert(!msgRes.contains(params.get(7))); assert (!msgRes.contains(params.get(7)));
} }
} }