Fixed test failure caused by NullPointerException present when Engine…

…erCountDisplay is updated
UQcsse3200 · Oct 16, 2023 · fc92869 · fc92869
1 parent e0701d9
commit fc92869
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/gamearea/EngineerCountDisplay.java b/source/core/src/main/com/csse3200/game/components/gamearea/EngineerCountDisplay.java
@@ -64,13 +64,15 @@ private void addActors() {
      * Updates the engineer count on the UI component
      */
     public void updateCount() {
-        int currentCount = ServiceLocator.getGameEndService().getEngineerCount();
-        String text = String.format("%d", currentCount);
-        engineerTb.getLabel().setText(text);
-        if (currentCount < ServiceLocator.getGameEndService().getThreshold()) {
+        if (engineerTb != null) { // fix for null pointer exception
+            int currentCount = ServiceLocator.getGameEndService().getEngineerCount();
+            String text = String.format("%d", currentCount);
+            engineerTb.getLabel().setText(text);
+            if (currentCount < ServiceLocator.getGameEndService().getThreshold()) {
 //            engineerTb.addAction(Actions.color(Color.RED, 0.5f, Interpolation.swingIn));
-            engineerTb.addAction(Actions.forever(new SequenceAction(Actions.fadeOut(0.5f),
-                    Actions.fadeIn(0.5f))));
+                engineerTb.addAction(Actions.forever(new SequenceAction(Actions.fadeOut(0.5f),
+                        Actions.fadeIn(0.5f))));
+            }
         }
     }
 

diff --git a/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java b/source/core/src/main/com/csse3200/game/components/tasks/MobTask/MobTask.java
@@ -115,13 +115,14 @@ public void update() {
 
         if(mob.getCenterPosition().x <= 1) {
           mob.getComponent(CombatStatsComponent.class).setHealth(0);
+          ServiceLocator.getGameEndService().updateEngineerCount();
         }
 
         // death check
         if ((mob.getComponent(CombatStatsComponent.class).getHealth() <= 0 && !deathFlag)) {
             // decrement engineer count
             // ! tests failing because of textbox
-            // ServiceLocator.getGameEndService().updateEngineerCount();
+
             changeState(State.DEATH);
             animate();
             movementTask.stop();

diff --git a/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java b/source/core/src/test/com/csse3200/game/components/SplitMoblingsTest.java
@@ -13,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -57,6 +58,7 @@ public void setUp() {
     ServiceLocator.registerPhysicsService(new PhysicsService());
 
     ServiceLocator.registerEntityService(new EntityService());
+    ServiceLocator.registerGameEndService(new GameEndService());
 
     RenderService render = new RenderService();
     render.setDebug(mock(DebugRenderer.class));
@@ -79,8 +81,7 @@ public void setUp() {
   @Test
   void shouldNotBeNull() {
     Entity mob = createSplitMob(5);
-    assertNotNull("Mobling components does not exists",
-        mob.getComponent(SplitMoblings.class));
+    Assertions.assertNotNull(mob.getComponent(SplitMoblings.class), "Mobling components does not exists");
   }
 
   @Test
@@ -94,8 +95,7 @@ void shouldHaveAsset() {
       if (entity.equals(baseMob) || entity.equals(projectile))
         continue;
 
-      assertTrue("moblings does not contain the right asset",
-          ServiceLocator.getResourceService().containsAsset(atlas[0], entity.getClass()));
+      Assertions.assertTrue(ServiceLocator.getResourceService().containsAsset(atlas[0], entity.getClass()), "moblings does not contain the right asset");
 
     }
   }