Fix 2 code smells in TNTTowerCombatTask (2 low)

UQcsse3200 · Oct 16, 2023 · 196dbb1 · 196dbb1
1 parent da0102b
commit 196dbb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/TNTTowerCombatTask.java b/source/core/src/main/com/csse3200/game/components/tasks/TNTTowerCombatTask.java
@@ -25,7 +25,6 @@ public class TNTTowerCombatTask extends DefaultTask implements PriorityTask {
     public static final String DEFAULT = "defaultStart";
     public static final String DAMAGE = "TNTDamageStart";
 
-
     // class attributes
     private final int priority;  // The active priority this task will have
     private final float maxRange;
@@ -35,7 +34,7 @@ public class TNTTowerCombatTask extends DefaultTask implements PriorityTask {
     private final GameTime timeSource;
     private long endTime;
     private final RaycastHit hit = new RaycastHit();
-    public boolean readToDelete = false;
+    private boolean readToDelete = false;
 
     public enum STATE {
         IDLE, EXPLODE, REMOVE
@@ -51,7 +50,6 @@ public TNTTowerCombatTask(int priority, float maxRange) {
         this.maxRange = maxRange;
         physics = ServiceLocator.getPhysicsService().getPhysics();
         timeSource = ServiceLocator.getTimeSource();
-
     }
 
     /**
@@ -87,7 +85,6 @@ public void update() {
      */
     public void updateTowerState() {
         // configure tower state depending on target visibility
-
         switch (towerState) {
             case IDLE -> {
                 // targets detected in idle mode - start deployment
@@ -103,19 +100,10 @@ public void updateTowerState() {
                 owner.getEntity().getEvents().trigger(DAMAGE);
                 towerState = STATE.REMOVE;
             }
-            case REMOVE -> {
+            default -> {        // REMOVE
                 readToDelete = true;
             }
         }
-
-
-    }
-    /**
-     * For stopping the running task
-     */
-    @Override
-    public void stop() {
-        super.stop();
     }
 
     /**
@@ -124,7 +112,6 @@ public void stop() {
      */
     @Override
     public int getPriority() {
-
         if (isReadyToDelete()) {
             owner.getEntity().setFlagForDelete(true);
             return -1;
@@ -152,11 +139,8 @@ public boolean isTargetVisible() {
     }
 
     public boolean isReadyToDelete() {
-
         return readToDelete;
     }
-
-
 }
 
 

diff --git a/source/core/src/test/com/csse3200/game/components/tasks/TNTTowerCombatTaskTest.java b/source/core/src/test/com/csse3200/game/components/tasks/TNTTowerCombatTaskTest.java
@@ -20,8 +20,6 @@
 
 @ExtendWith(MockitoExtension.class)
 public class TNTTowerCombatTaskTest {
-
-
     TNTTowerCombatTask tntTowerCombatTask;
 
     @BeforeEach
@@ -37,7 +35,6 @@ void setUp() {
 
     @Test
     public void testStartTriggersDefaultEvent() {
-
         Entity entity = createTNT();
 
         EventListener0 defaultStartListener = mock(EventListener0.class);
@@ -50,7 +47,6 @@ public void testStartTriggersDefaultEvent() {
 
     @Test
     public void testUpdateTowerStateWithTargetInRange() {
-
         Entity entity = createTNT();
         entity.setPosition(10,10);
 
@@ -90,12 +86,10 @@ public void testUpdateTowerStateWithTargetInRange() {
         tntTowerCombatTask.updateTowerState();
         // Set flag to dispose
         assertTrue(tntTowerCombatTask.isReadyToDelete());
-
     }
 
     @Test
     public void testStayAtIdleWhenNoTargetInRange() {
-
         Entity entity = createTNT();
         entity.setPosition(10,10);
 
@@ -117,7 +111,6 @@ public void testStayAtIdleWhenNoTargetInRange() {
         verifyNoInteractions(defaultStartListener);
         // still in idle
         assertEquals(TNTTowerCombatTask.STATE.IDLE, tntTowerCombatTask.getState());
-
     }
 
     Entity createTNT() {
@@ -128,7 +121,6 @@ Entity createTNT() {
                 .addComponent(new ColliderComponent());
         entity.create();
         return entity;
-
     }
 
     Entity createNPC() {
@@ -139,6 +131,4 @@ Entity createNPC() {
         Target.create();
         return Target;
     }
-
-
 }