Merge branch '09_deserialization'

3 files changed, 99 insertions, 1 deletions

diff --git a/test/ch/epfl/xblast/GameStateSerializerTest.java b/test/ch/epfl/xblast/GameStateSerializerTest.java
new file mode 100644
index 0000000..c0547bb
--- /dev/null
+++ b/test/ch/epfl/xblast/GameStateSerializerTest.java
@@ -0,0 +1,71 @@
+package ch.epfl.xblast;
+
+import ch.epfl.xblast.server.*;
+import ch.epfl.xblast.server.Level;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author Timothée FLOURE (257420)
+ */
+public class GameStateSerializerTest {
+
+
+    /**
+     * Build a list a bytes corresponding to the serialized data of the initial GameState.
+     *
+     * @return the serialized gametstate
+     */
+    public static List<Byte> getInitialValues() {
+        List<Integer> sourceValues = Arrays.asList(
+                // Serialized Board
+                121, -50, 2, 1, -2, 0, 3, 1, 3, 1, -2, 0, 1, 1, 3, 1, 3,
+                1, 3, 1, 1, -2, 0, 1, 3, 1, 3, -2, 0, -1, 1, 3, 1, 3, 1,
+                3, 1, 1, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3,
+                2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2,
+                3, 1, 0, 0, 3, 1, 3, 1, 0, 0, 1, 1, 3, 1, 1, 0, 0, 1, 3,
+                1, 3, 0, 0, -1, 1, 3, 1, 1, -5, 2, 3, 2, 3, -5, 2, 3, 2,
+                3, 1, -2, 0, 3, -2, 0, 1, 3, 2, 1, 2,
+                // Explosions (blasts & bombs)
+                4, -128, 16, -63, 16,
+                // Players
+                3, 24, 24, 6,
+                3, -40, 24, 26,
+                3, -40, -72, 46,
+                3, 24, -72, 66,
+                // Ticks
+                60);
+
+        // Build a List of Bytes from the sources values
+        return sourceValues.stream().map(i -> (byte) i.intValue()).collect(Collectors.toList());
+    }
+
+    @Test
+    public void IntialGameStateSerializationTest() {
+        List<Byte> expectedValues = getInitialValues();
+
+        // Get the current values
+        List<Byte> currentValues = GameStateSerializer.serialize(
+                    Level.DEFAULT_LEVEL.painter(),
+                    Level.DEFAULT_LEVEL.initialState()
+        );
+
+        // Check the first element (number of elements)
+        Assert.assertEquals(
+                Byte.toUnsignedInt(expectedValues.get(0)),
+                Byte.toUnsignedInt(currentValues.get(0))
+        );
+
+        // Check the rest of the data chunk
+        Assert.assertEquals(
+                    expectedValues.subList(1,expectedValues.size()),
+                    currentValues.subList(1,expectedValues.size())
+                );
+    }
+}
diff --git a/test/ch/epfl/xblast/client/GameStateDeserializerTest.java b/test/ch/epfl/xblast/client/GameStateDeserializerTest.java
new file mode 100644
index 0000000..e74728e
--- /dev/null
+++ b/test/ch/epfl/xblast/client/GameStateDeserializerTest.java
@@ -0,0 +1,27 @@
+package ch.epfl.xblast.client;
+
+import ch.epfl.xblast.GameStateSerializerTest;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.fail;
+
+/**
+ * @author Timothée FLOURE (257420)
+ * @author Pacien TRAN-GIRARD (261948)
+ */
+public class GameStateDeserializerTest {
+
+    private static final List<Byte> SERIALIZED_INITIAL_GAME_STATE = GameStateSerializerTest.getInitialValues();
+
+    @Test
+    public void deserializationTerminates() {
+        try {
+            GameStateDeserializer.deserialize(SERIALIZED_INITIAL_GAME_STATE);
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
+    }
+
+}
diff --git a/test/ch/epfl/xblast/server/BlockTest.java b/test/ch/epfl/xblast/server/BlockTest.java
index 31fd08a..9938299 100644
--- a/test/ch/epfl/xblast/server/BlockTest.java
+++ b/test/ch/epfl/xblast/server/BlockTest.java
@@ -7,7 +7,7 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Timothée FLOURE (257420)
- * @author pacien TRAN-GIRARD (261948)
+ * @author Pacien TRAN-GIRARD (261948)
  */
 public class BlockTest {