From fe42257cb4ac58f8e86cff28440bdc0cb458ff1f Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 25 Feb 2020 16:55:35 +0100
Subject: [PATCH] =?UTF-8?q?Fikser=20litt=20p=C3=A5=20testene=20til=20Robot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fiasko/roborally/objects/RobotTest.java   | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java b/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java
index b07529e..4a53059 100644
--- a/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java
+++ b/src/test/java/inf112/fiasko/roborally/objects/RobotTest.java
@@ -10,61 +10,69 @@ import org.junit.Test;
 public class RobotTest {
     private Position robotPosition;
     private Robot testRobot;
+    private int nextFlag = 1;
+
     @Before
-    public void setUp(){
+    public void setUp() {
         robotPosition = new Position(3,6);
         testRobot = new Robot(RobotID.ROBOT_6, robotPosition);
     }
+
     @Test
     public void testRobotGetDamageOnInitializedRobot(){
-        assertEquals(0, testRobot.getDamage());
+        assertEquals(0, testRobot.getDamageTaken());
     }
+
     @Test
     public void testRobotGetPlayerId(){
         assertEquals(RobotID.ROBOT_6, testRobot.getRobotId());
     }
+
     @Test
     public void testRobotGetBackupOnInitializedRobot(){
         assertEquals(robotPosition, testRobot.getBackupPosition());
     }
+
     @Test
-    public void testRobotSetDamage(){
-        testRobot.setDamage(2);
-        assertEquals(2, testRobot.getDamage());
+    public void testRobotSetDamage() {
+        testRobot.setDamageTaken(2);
+        assertEquals(2, testRobot.getDamageTaken());
     }
+
     @Test
     public void testRobotGetPositionOnInitializedRobot(){
         assertEquals(robotPosition, testRobot.getPosition());
     }
+
     @Test
-    public void testRobotGetPositionOnRobotWithNewPosition(){
+    public void testRobotGetPositionOnRobotWithNewPosition() {
         Position newRobotPosition = new Position(8,12);
         testRobot.setPosition(newRobotPosition);
         assertEquals(newRobotPosition, testRobot.getPosition());
     }
+
     @Test
     public void testRobotIsInPowerDownOnInitializedRobot(){
         assertEquals(false, testRobot.isInPowerDown());
     }
+
     @Test
-    public void testRobotSetPowerDown(){
+    public void testRobotSetPowerDown() {
         testRobot.setPowerDown(true);
         assertEquals(true, testRobot.isInPowerDown());
     }
+
     @Test
-    public void testRobotGetNewFlag(){
-        int nextFlag = 2;
-        Position nextFlagPosition = new Position(3,4);
-        testRobot.setLastFlagVisitedAndBackupPosition(nextFlag,nextFlagPosition);
-        assertEquals(2, testRobot.getLastFlagVisited());
+    public void testRobotGetNewFlag() {
+        testRobot.setLastFlagVisitedAndUpdateBackupPosition(nextFlag);
+        assertEquals(1, testRobot.getLastFlagVisited());
     }
+
     @Test
-    public void testRobotGetNewBackup(){
-        int nextFlag = 2;
+    public void testRobotGetNewBackup() {
         Position nextFlagPosition = new Position(3,4);
-        testRobot.setLastFlagVisitedAndBackupPosition(nextFlag,nextFlagPosition);
+        testRobot.setPosition(nextFlagPosition);
+        testRobot.setLastFlagVisitedAndUpdateBackupPosition(nextFlag);
         assertEquals(nextFlagPosition, testRobot.getBackupPosition());
     }
-
-
 }