3 files changed, 58 insertions, 9 deletions

@@ -56,7 +56,7 @@ public final class ImmutableEvent
 
     public List<Direction> getLegalMoves()
     {
-        return Collections.unmodifiableList(ev.getLegalMoves());
+        return ev.getLegalMoves();
     }
 
     public int getAnimationStep()
@@ -0,0 +1,56 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.fourisland.fourpuzzle.gamestate.mapview.event;
+
+import com.fourisland.fourpuzzle.Direction;
+import com.fourisland.fourpuzzle.Layer;
+import com.fourisland.fourpuzzle.gamestate.mapview.Map;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class ImmutableEventTest {
+
+    ImmutableEvent ie;
+    Event ev;
+
+    @Before
+    public void setUp()
+    {
+        LayerEvent temp = new LayerEvent(1, 2, "Test");
+        temp.addEvent(new PossibleEvent());
+        
+        ev = temp;
+        ie = new ImmutableEvent(ev);
+    }
+    
+    @Test
+    public void testLiveness()
+    {
+        // First, modify the internal event
+        ev.setAnimationStep(2);
+        ev.setDirection(Direction.East);
+        ev.setLocation(1, 3);
+        ev.setMoveSpeed(MoveSpeed.Slower2);
+        
+        // Then, ensure that the immutable event reflects these changes
+        assertEquals(ie.getAnimationStep(), 2);
+        assertEquals(ie.getDirection(), Direction.East);
+        assertEquals(ie.getLocation(), new Point(1, 3));
+        assertEquals(ie.getMoveSpeed(), MoveSpeed.Slower2);
+    }
+
+}
\ No newline at end of file
@@ -18,9 +18,6 @@ import static org.junit.Assert.*;
  */
 public class SwitchPreconditionTest {
 
-    public SwitchPreconditionTest() {
-    }
-    
     String switchName = "TestSwitch";
     SwitchPrecondition sp;
 
@@ -44,9 +41,5 @@ public class SwitchPreconditionTest {
         Game.getSaveFile().getSwitches().put(switchName, true);
         assertTrue(sp.match());
     }
-
-    @After
-    public void tearDown() {
-    }
-
+    
 }
\ No newline at end of file