Merge branch 'master' of https://github.com/inf112-v20/Fiasko

src/test/java/inf112/fiasko/roborally/element_properties/DirectionTest.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.element_properties;
 
 import inf112.fiasko.roborally.element_properties.Direction;
 import org.junit.Test;

src/test/java/inf112/fiasko/roborally/element_properties/PositionTest.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.element_properties;
 
 import inf112.fiasko.roborally.element_properties.Position;
 import org.junit.Before;

src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.element_properties;
 
 import inf112.fiasko.roborally.element_properties.TileType;
 import org.junit.Test;

src/test/java/inf112/fiasko/roborally/element_properties/WallTypeTest.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.element_properties;
 
 import inf112.fiasko.roborally.element_properties.TileType;
 import inf112.fiasko.roborally.element_properties.WallType;

src/test/java/inf112/fiasko/roborally/game/GameTest.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.game;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java

@@ -1,4 +1,4 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.objects;
 
 import inf112.fiasko.roborally.objects.DrawableObject;
 import inf112.fiasko.roborally.element_properties.GameTexture;

src/test/java/inf112/fiasko/roborally/objects/RobotTest.java

@@ -0,0 +1,22 @@
+package inf112.fiasko.roborally.objects;
+
+import inf112.fiasko.roborally.element_properties.Position;
+import inf112.fiasko.roborally.objects.Robot;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class RobotTest {
+    @Test
+    public void testRobotGetDamageOnInitializedRobot(){
+        Position robotPosition = new Position(3,6);
+        Robot testRobotGetDamage = new Robot(6, robotPosition);
+        assertEquals(0, testRobotGetDamage.getDamage());
+    }
+    @Test
+    public void testRobotSetDamage(){
+        Position robotPosition = new Position(3,6);
+        Robot testRobotSetDamage = new Robot(6, robotPosition);
+        testRobotSetDamage.setDamage(2);
+        assertEquals(2, testRobotSetDamage.getDamage());
+    }
+}

src/test/java/inf112/fiasko/roborally/objects/TileTest.java

@@ -1,8 +1,7 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.objects;
 
 import inf112.fiasko.roborally.element_properties.Direction;
 import inf112.fiasko.roborally.element_properties.TileType;
-import inf112.fiasko.roborally.objects.Tile;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -38,4 +37,9 @@ public class TileTest {
     public void getDirectionFromTile2() {
         assertEquals(Direction.SOUTH, tile2.getDirection());
     }
+
+    @Test (expected = IllegalArgumentException.class)
+    public void invalidTileThrowsException() {
+        new Tile(TileType.TRANSPORT_BAND_FAST, Direction.NORTH_EAST);
+    }
 }

src/test/java/inf112/fiasko/roborally/objects/WallTest.java

@@ -1,12 +1,12 @@
-package inf112.fiasko.roborally;
+package inf112.fiasko.roborally.objects;
 
 import inf112.fiasko.roborally.element_properties.Direction;
-import inf112.fiasko.roborally.element_properties.Wall;
+import inf112.fiasko.roborally.objects.Wall;
 import inf112.fiasko.roborally.element_properties.WallType;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
-public class TestWall {
+public class WallTest {
     @Test
     public void testWallGetWallTypeNormal(){
         Wall testGetWall = new Wall(WallType.WALL_NORMAL, Direction.NORTH);