From 6a6669ae5d4d879ddfa5709741d24dc02d13b432 Mon Sep 17 00:00:00 2001 From: Yannik Bretschneider Date: Sun, 30 May 2021 18:07:05 +0200 Subject: [PATCH] refactor: re-formatted JSONTest --- .../marvelous/gamelibrary/json/JSONTest.java | 64 +++++++++++-------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/src/test/java/uulm/teamname/marvelous/gamelibrary/json/JSONTest.java b/src/test/java/uulm/teamname/marvelous/gamelibrary/json/JSONTest.java index e70c8e2..13f45ff 100644 --- a/src/test/java/uulm/teamname/marvelous/gamelibrary/json/JSONTest.java +++ b/src/test/java/uulm/teamname/marvelous/gamelibrary/json/JSONTest.java @@ -2,19 +2,27 @@ package uulm.teamname.marvelous.gamelibrary.json; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import net.jqwik.api.*; +import net.jqwik.api.lifecycle.BeforeContainer; +import net.jqwik.api.lifecycle.BeforeProperty; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; + import static org.assertj.core.api.Assertions.*; +import uulm.teamname.marvelous.gamelibrary.IntVector2; import uulm.teamname.marvelous.gamelibrary.entities.EntityID; +import uulm.teamname.marvelous.gamelibrary.entities.EntityType; +import uulm.teamname.marvelous.gamelibrary.entities.Rock; import uulm.teamname.marvelous.gamelibrary.events.Event; import uulm.teamname.marvelous.gamelibrary.events.EventBuilder; import uulm.teamname.marvelous.gamelibrary.events.EventType; import uulm.teamname.marvelous.gamelibrary.json.basic.EventMessage; +import uulm.teamname.marvelous.gamelibrary.requests.*; -import java.util.HashMap; +import java.util.*; class JSONTest { @@ -29,11 +37,11 @@ class JSONTest { @BeforeEach void setUp() { messageStructureStart = """ - { - "messages":[ - """; - messageStructureEnd = new String[] { - """ + { + "messages":[ + """; + messageStructureEnd = new String[]{ + """ ], "messageType": "REQUESTS", "customContentType": "TestCustomContent", @@ -43,7 +51,7 @@ class JSONTest { "customProperty" = true } """, - """ + """ ], "messageType": "EVENTS", "customContentType": "TestCustomContent", @@ -75,9 +83,9 @@ class JSONTest { }; String eventRepresentation = """ - {"eventType": "Ack"}, - {"eventType": "Nack"} - """; + {"eventType": "Ack"}, + {"eventType": "Nack"} + """; String completeMessageStructure = messageStructureStart + eventRepresentation + messageStructureEnd[1]; target.messageType = MessageType.EVENTS; @@ -90,19 +98,19 @@ class JSONTest { @Test void parseMoreComplicatedEvents() { String eventRepresentation = """ - { - "eventType": "GamestateEvent", - "activeCharacter": {"entityID": "P2", "ID": 4}, - "turnOrder": [ - {"entityID": "P2", "ID": 4}, - {"entityID": "P2", "ID": 2}, - {"entityID": "P1", "ID": 3}, - {"entityID": "NPC", "ID": 1}, - {"entityID": "InfinityStones", "ID": 5}, - {"entityID": "Rocks", "ID": 0} - ] - } - """; + { + "eventType": "GamestateEvent", + "activeCharacter": {"entityID": "P2", "ID": 4}, + "turnOrder": [ + {"entityID": "P2", "ID": 4}, + {"entityID": "P2", "ID": 2}, + {"entityID": "P1", "ID": 3}, + {"entityID": "NPC", "ID": 1}, + {"entityID": "InfinityStones", "ID": 5}, + {"entityID": "Rocks", "ID": 0} + ] + } + """; String completeMessageStructure = messageStructureStart + eventRepresentation + messageStructureEnd[1]; System.out.println(JSON.parse(completeMessageStructure)); @@ -112,11 +120,11 @@ class JSONTest { @Disabled void simpleInDevTest() throws JsonProcessingException { String simpleEntity = """ - { - "entityID": "P2", - "ID": 4 - } - """; + { + "entityID": "P2", + "ID": 4 + } + """; System.out.println(new ObjectMapper().readValue(simpleEntity, EntityID.class)); }