Unit tests for soldiers, adjust Builder unit atlas and sprites

source/core/assets/images/builder.atlas

@@ -1,15 +1,8 @@
 builder.png
-size: 2048, 128
+size: 1024, 384
 format: RGBA8888
 filter: Linear,Linear
 repeat: none
-builder_idle
-  rotate: false
-  xy: 1024, 0
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: 0
 builder_back_left_move
   rotate: false
   xy: 0, 0
@@ -66,62 +59,111 @@ builder_back_right_move
   orig: 128, 128
   offset: 0, 0
   index: 3
+builder_forward_left_action
+  rotate: false
+  xy: 0, 128
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 0
+builder_forward_left_action
+  rotate: false
+  xy: 128, 128
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 1
+builder_forward_left_action
+  rotate: false
+  xy: 256, 128
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 2
 builder_forward_left_move
   rotate: false
-  xy: 1024, 0
+  xy: 384, 128
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 0
 builder_forward_left_move
   rotate: false
-  xy: 1152, 0
+  xy: 512, 128
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 1
-builder_forward_left_move
+builder_forward_left_move_2 copy
   rotate: false
-  xy: 1280, 0
+  xy: 640, 128
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
-  index: 2
+  index: -1
 builder_forward_left_move
   rotate: false
-  xy: 1408, 0
+  xy: 768, 128
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 3
+builder_forward_right_action
+  rotate: false
+  xy: 896, 128
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 0
+builder_forward_right_action
+  rotate: false
+  xy: 0, 256
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 1
+builder_forward_right_action
+  rotate: false
+  xy: 128, 256
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 2
 builder_forward_right_move
   rotate: false
-  xy: 1536, 0
+  xy: 256, 256
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 0
 builder_forward_right_move
   rotate: false
-  xy: 1664, 0
+  xy: 384, 256
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 1
 builder_forward_right_move
   rotate: false
-  xy: 1792, 0
+  xy: 512, 256
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 2
 builder_forward_right_move
   rotate: false
-  xy: 1920, 0
+  xy: 640, 256
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: 3
+builder_idle
+  rotate: false
+  xy: 768, 256
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: 0
 default
   rotate: false
   xy: 1024, 0

source/core/src/test/com/deco2800/game/soldiers/movement/FightingMovementTaskTest.java

@@ -0,0 +1,54 @@
+package com.deco2800.game.soldiers.movement;
+
+import com.badlogic.gdx.math.Vector2;
+import com.deco2800.game.ai.tasks.Task;
+import com.deco2800.game.entities.Entity;
+import com.deco2800.game.entities.EntityService;
+import com.deco2800.game.extensions.GameExtension;
+import com.deco2800.game.map.MapService;
+import com.deco2800.game.physics.PhysicsService;
+import com.deco2800.game.physics.components.PhysicsComponent;
+import com.deco2800.game.physics.components.PhysicsMovementComponent;
+import com.deco2800.game.services.GameTime;
+import com.deco2800.game.services.ServiceLocator;
+import com.deco2800.game.soldiers.movement.FightingMovementTask;
+import com.deco2800.game.worker.components.movement.WorkerMovementTask;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(GameExtension.class)
+public class FightingMovementTaskTest {
+    @BeforeEach
+    void beforeEach() {
+        GameTime gameTime = mock(GameTime.class);
+        when(gameTime.getTime()).thenReturn(0L);
+        ServiceLocator.registerTimeSource(gameTime);
+        ServiceLocator.registerMapService(new MapService());
+        ServiceLocator.registerPhysicsService(new PhysicsService());
+        ServiceLocator.registerEntityService(new EntityService());
+    }
+
+    @Test
+    void shouldMoveOnStart() {
+        Vector2 target = new Vector2(10f, 10f);
+        Entity owner = new Entity().addComponent(new PhysicsComponent());
+        PhysicsMovementComponent movementComponent = new PhysicsMovementComponent();
+        owner.addComponent(movementComponent);
+        FightingMovementTask task = new FightingMovementTask(target, owner);
+
+        Entity entity = new Entity().addComponent(new PhysicsComponent());
+        entity.addComponent(movementComponent);
+        entity.create();
+
+        task.create(() -> entity);
+        task.start();
+        assertTrue(movementComponent.getMoving());
+        assertEquals(target, movementComponent.getTarget());
+        assertEquals(Task.Status.ACTIVE, task.getStatus());
+    }
+}

source/core/src/test/com/deco2800/game/soldiers/movement/SoldierIdleTaskTest.java

@@ -11,6 +11,7 @@
 import com.deco2800.game.physics.components.PhysicsMovementComponent;
 import com.deco2800.game.services.GameTime;
 import com.deco2800.game.services.ServiceLocator;
+import com.deco2800.game.soldiers.movement.SoldierIdleTask;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -25,12 +26,12 @@
 public class SoldierIdleTaskTest {
     @BeforeEach
     void beforeEach() {
-        ServiceLocator.registerMapService(new MapService());
-        ServiceLocator.registerPhysicsService(new PhysicsService());
-        ServiceLocator.registerEntityService(new EntityService());
         GameTime gameTime = mock(GameTime.class);
         when(gameTime.getTime()).thenReturn(0L);
         ServiceLocator.registerTimeSource(gameTime);
+        ServiceLocator.registerEntityService(new EntityService());
+        ServiceLocator.registerMapService(new MapService());
+        ServiceLocator.registerPhysicsService(new PhysicsService());
     }
 
     @Test
@@ -87,4 +88,6 @@ void shouldNotBeIdle() {
         task.update();
         assertFalse(task.isIdling()); // Should still be moving
     }
+
+
 }