3 files changed, 34 insertions, 76 deletions

diff --git a/test/ch/epfl/xblast/GameStateSerializerTest.java b/test/ch/epfl/xblast/GameStateSerializerTest.java
deleted file mode 100644
index c0547bb..0000000
--- a/test/ch/epfl/xblast/GameStateSerializerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-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
index e74728e..418d283 100644
--- a/test/ch/epfl/xblast/client/GameStateDeserializerTest.java
+++ b/test/ch/epfl/xblast/client/GameStateDeserializerTest.java
@@ -1,9 +1,8 @@
 package ch.epfl.xblast.client;
 
-import ch.epfl.xblast.GameStateSerializerTest;
 import org.junit.Test;
 
-import java.util.List;
+import java.util.Arrays;
 
 import static org.junit.Assert.fail;
 
@@ -13,12 +12,33 @@ import static org.junit.Assert.fail;
  */
 public class GameStateDeserializerTest {
 
-    private static final List<Byte> SERIALIZED_INITIAL_GAME_STATE = GameStateSerializerTest.getInitialValues();
+    private static final Byte[] SERIALIZED_GAME_STATE = {
+            // 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
+    };
 
     @Test
     public void deserializationTerminates() {
         try {
-            GameStateDeserializer.deserialize(SERIALIZED_INITIAL_GAME_STATE);
+            GameStateDeserializer.deserialize(Arrays.asList(SERIALIZED_GAME_STATE));
         } catch (Exception e) {
             fail(e.getMessage());
         }
diff --git a/test/ch/epfl/xblast/etape6/RandomTestGame.java b/test/ch/epfl/xblast/etape6/RandomTestGame.java
index 8192956..90435c8 100644
--- a/test/ch/epfl/xblast/etape6/RandomTestGame.java
+++ b/test/ch/epfl/xblast/etape6/RandomTestGame.java
@@ -9,6 +9,7 @@ import ch.epfl.xblast.server.GameState;
 import ch.epfl.xblast.server.Player;
 import ch.epfl.xblast.server.Player.DirectedPosition;
 import ch.epfl.xblast.server.debug.RandomEventGenerator;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -26,6 +27,7 @@ import static org.junit.Assert.assertTrue;
  * Checks that the player move as in the example for the random game provided as example
  *
  * @author EPFL
+ * @author Pacien TRAN-GIRARD (261948)
  */
 public class RandomTestGame {
 
@@ -56,7 +58,6 @@ public class RandomTestGame {
                 new Player(PlayerID.PLAYER_4, lives, p4, maxBombs, bombRange));
     }
 
-
     @Test
     public void testPositionsRandomGame() throws InterruptedException, IOException, URISyntaxException {
         String fileName = getClass().getResource("/stage6files/randomgame_positions.txt").toURI().getPath();
@@ -83,4 +84,12 @@ public class RandomTestGame {
         player_positions.close();
     }
 
+    /**
+     * Resets the random bonus generator.
+     */
+    @Before
+    public void resetRandomSource() {
+        Block.resetRandomGenerator();
+    }
+
 }