Merge pull request #201 from dybyte/dy102

[Feature]: add tests

Author: jvondermarck

pom.xml

@@ -37,6 +37,18 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.17.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>5.2.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>one.jpro</groupId>
             <artifactId>jpro-webapi</artifactId>
@@ -99,7 +111,8 @@
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <!-- Add Main-Class to the manifest -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>${mainClassName}</mainClass>
                                 </transformer>
                             </transformers>

src/main/java/com/dinosaur/dinosaurexploder/components/BombComponent.java

@@ -24,32 +24,27 @@ public class BombComponent extends Component implements Bomb {
     private int bombCount = 3;
     private int maxBombCount = 3;
     private Image spcshpImg;
-    
+    private int selectedShip;
+
     // Tracking variables for regeneration
     private int lastLevel = 1;
     private int coinCounter = 0;
     private static final int COINS_NEEDED_FOR_BOMB = 15; // Number of coins needed to regenerate a bomb
-   
+
     public BombComponent() {
         // Selected spaceship from GameData
-        int selectedShip = GameData.getSelectedShip();
+        this.selectedShip = GameData.getSelectedShip();
 
         //  Set the image of SelectedShip using the spaceship number
-        if (selectedShip != 0) {
-            String shipImagePath = "/assets/textures/spaceship" + selectedShip + ".png";
-            System.out.println("Selected spaceship: " + selectedShip);
-            this.spcshpImg = new Image(shipImagePath);
-        } 
+
     }
 
-    
-    // Declaring Bomb Text
-    private Image bomb = new Image(GameConstants.BOMB_IMAGE_PATH);
     // Declaring 3 Bomb
-    ImageView bomb1 = new ImageView(bomb);
-    ImageView bomb2 = new ImageView(bomb);
-    ImageView bomb3 = new ImageView(bomb);
-    private Text bombText = new Text("Bombs Left: " + bombCount);
+    ImageView bomb1;
+    ImageView bomb2;
+    ImageView bomb3;
+    // Declaring Bomb Text
+    private Text bombText;
 
 
     private Node bombUI;
@@ -58,6 +53,11 @@ public BombComponent() {
 
     @Override
     public void onAdded() {
+        Image bomb = new Image(GameConstants.BOMB_IMAGE_PATH);
+        bomb1 = new ImageView(bomb);
+        bomb2 = new ImageView(bomb);
+        bomb3 = new ImageView(bomb);
+
         // Initialize bombText with the translated string
         bombText = new Text(languageManager.getTranslation("bombs_left") + ": " + bombCount);
 
@@ -86,6 +86,7 @@ private void updateTexts() {
 
     /**
      * This method creates the UI for displaying the bomb count and bomb images.
+     *
      * @return Node - The created bomb UI node
      */
     private Node createBombUI() {
@@ -106,16 +107,17 @@ private Node createBombUI() {
     /**
      * Updates the bomb UI based on the current bomb count.
      */
-    private void updateBombUI() {
+    protected void updateBombUI() {
         bomb1.setVisible(bombCount >= 1);
         bomb2.setVisible(bombCount >= 2);
         bomb3.setVisible(bombCount >= 3);
         // Update bomb text with the remaining bombs
         bombText.setText(languageManager.getTranslation("bombs_left") + ": " + bombCount);
     }
+
     /**
      * Summary:
-     *      This method returns the current number of bombs.
+     * This method returns the current number of bombs.
      */
     @Override
     public int getBombCount() {
@@ -124,9 +126,9 @@ public int getBombCount() {
 
     /**
      * Summary :
-     *      This method is used to launch a row of bullets as a bomb.
+     * This method is used to launch a row of bullets as a bomb.
      * Parameters :
-     *      Entity player - The player entity using the bomb
+     * Entity player - The player entity using the bomb
      */
     @Override
     public void useBomb(Entity player) {
@@ -138,15 +140,23 @@ public void useBomb(Entity player) {
             System.out.println("No bombs left!");
         }
     }
+
     /**
      * Summary :
-     *      This method spawns a row of bullets from the player's position.
+     * This method spawns a row of bullets from the player's position.
      * Parameters :
-     *      Entity player - The player entity from which to spawn the bullets
+     * Entity player - The player entity from which to spawn the bullets
      */
-    private void spawnBombBullets(Entity player) {
+    protected void spawnBombBullets(Entity player) {
         Point2D center = player.getCenter();
         Image projImg = new Image(GameConstants.BASE_PROJECTILE_IMAGE_PATH);
+
+        if (selectedShip != 0) {
+            String shipImagePath = "/assets/textures/spaceship" + selectedShip + ".png";
+            System.out.println("Selected spaceship: " + selectedShip);
+            this.spcshpImg = new Image(shipImagePath);
+        }
+
         for (int i = -5; i <= 5; i++) {
             double angle = entity.getRotation() - 90 + i * 10;
             Vec2 direction = Vec2.fromAngle(angle);
@@ -155,11 +165,11 @@ private void spawnBombBullets(Entity player) {
         }
         System.out.println("Bomb used! " + getBombCount() + " bombs left!");
     }
-    
+
     /**
      * Regenerates bombs when a new level is reached.
      * Call this method when the player advances to a new level.
-     * 
+     *
      * @param currentLevel The current level of the game
      */
     public void checkLevelForBombRegeneration(int currentLevel) {
@@ -170,7 +180,7 @@ public void checkLevelForBombRegeneration(int currentLevel) {
             System.out.println("Level up! Regenerated a bomb. Current bombs: " + bombCount);
         }
     }
-    
+
     /**
      * Tracks coin collection and regenerates bombs when enough coins are collected.
      * Call this method whenever the player collects a coin.
@@ -184,14 +194,18 @@ public void trackCoinForBombRegeneration() {
             System.out.println("Collected " + COINS_NEEDED_FOR_BOMB + " coins! Regenerated a bomb. Current bombs: " + bombCount);
         }
     }
-    
+
     /**
      * Regenerates the specified number of bombs, not exceeding the maximum.
-     * 
+     *
      * @param count The number of bombs to regenerate
      */
     private void regenerateBomb(int count) {
         bombCount = Math.min(bombCount + count, maxBombCount);
         updateBombUI();
     }
+
+    public int getCoinCounter() {
+        return coinCounter;
+    }
 }

src/main/java/com/dinosaur/dinosaurexploder/components/CollectedCoinsComponent.java

@@ -40,7 +40,7 @@ public void onAdded() {
         entity.getViewComponent().addChild(coinUI);
     }
 
-    private void updateText() {
+    protected void updateText() {
         coinText.setText(languageManager.getTranslation("coin") + ": " + coin);
     }
 
@@ -79,4 +79,8 @@ public void incrementCoin() {
         updateText();
         saveTotalCoins();
     }
+
+    public int getCoin() {
+        return coin;
+    }
 }

src/main/java/com/dinosaur/dinosaurexploder/components/LifeComponent.java

@@ -20,21 +20,26 @@
 public class LifeComponent extends Component implements Life {
 
     private static final int MAX_LIVES = 3;
-    private final Image heart = new Image(GameConstants.HEART_IMAGE_PATH);
-    private final Image heartLost = new Image(GameConstants.HEART_LOST_IMAGE_PATH);
+    private Image heart;
+    private Image heartLost;
     private int life = MAX_LIVES;
 
     // Declaring Lives Text
     private Text lifeText;
     // Declaring 3 Hearts
-    private final ImageView heart1 = new ImageView(heart);
-    private final ImageView heart2 = new ImageView(heart);
-    private final ImageView heart3 = new ImageView(heart);
+    private ImageView heart1;
+    private ImageView heart2;
+    private ImageView heart3;
 
     private final LanguageManager languageManager = LanguageManager.getInstance();
 
     @Override
     public void onAdded() {
+        heart = new Image(GameConstants.HEART_IMAGE_PATH);
+        heart1 = new ImageView(heart);
+        heart2 = new ImageView(heart);
+        heart3 = new ImageView(heart);
+
         // Initialize lifeText with the translated string
         lifeText = new Text(languageManager.getTranslation("lives"));
 
@@ -59,6 +64,7 @@ private void updateTexts() {
     }
 
     private void updateLifeDisplay() {
+        heartLost = new Image(GameConstants.HEART_LOST_IMAGE_PATH);
         // Clear previous entities
         clearEntity();
 
@@ -113,4 +119,8 @@ public int decreaseLife(int i) {
         life -= i;
         return life;
     }
+
+    public int getLife() {
+        return life;
+    }
 }

src/main/java/com/dinosaur/dinosaurexploder/components/RedDinoComponent.java

@@ -4,8 +4,8 @@
 import com.almasb.fxgl.dsl.FXGL;
 import com.almasb.fxgl.entity.SpawnData;
 import com.almasb.fxgl.entity.component.Component;
-import com.almasb.fxgl.time.LocalTimer;
 import com.dinosaur.dinosaurexploder.interfaces.Dinosaur;
+import com.dinosaur.dinosaurexploder.utils.GameTimer;
 import com.dinosaur.dinosaurexploder.utils.LevelManager;
 import com.dinosaur.dinosaurexploder.view.DinosaurGUI;
 import com.dinosaur.dinosaurexploder.constants.GameConstants;
@@ -16,12 +16,17 @@
 
 /**
  * Summary :
- *      This class extends Component and Implements the Dinosaur Classes and Handles the Shooting and Updating the Dino
+ * This class extends Component and Implements the Dinosaur Classes and Handles the Shooting and Updating the Dino
  */
 public class RedDinoComponent extends Component implements Dinosaur {
     double horizontalSpeed = 1.5;
-    public int lives = 10;
-    private LocalTimer shootTimer = FXGL.newLocalTimer();
+    private int lives = 10;
+    private final GameTimer gameTimer;
+
+    public RedDinoComponent(GameTimer gameTimer) {
+        this.gameTimer = gameTimer;
+    }
+
     private boolean isPaused = false;
     private boolean isMuted = false;
 
@@ -58,57 +63,57 @@ public void setMuted(boolean muted) {
     }
 
     @Override
-    public void onAdded(){
+    public void onAdded() {
         //Get the current enemy speed from the level manager
         //levelManager = FXGL.geto("levelManager");
         firstTime = true;
     }
+
     /**
      * Summary :
-     *      This method runs for every frame like a continues flow , without any stop until we put stop to it.
+     * This method runs for every frame like a continues flow , without any stop until we put stop to it.
      * Parameters :
-     *      double ptf
+     * double ptf
      */
     @Override
     public void onUpdate(double ptf) {
-        if(isPaused) return;
+        if (isPaused) return;
 
-        if(firstTime){
+        if (firstTime) {
             System.out.println("level: " + levelManager.getCurrentLevel());
             horizontalSpeed = levelManager.getEnemySpeed();
-            lives = levelManager.getCurrentLevel()*2;
+            lives = levelManager.getCurrentLevel() * 2;
             firstTime = false;
         }
 
         // the Dino turns around just before he hits a site of the screen
-        if(entity.getX() < 0 || entity.getX() > DinosaurGUI.WIDTH - entity.getWidth()-40) {
+        if (entity.getX() < 0 || entity.getX() > DinosaurGUI.WIDTH - entity.getWidth() - 40) {
             horizontalSpeed *= -1;
         }
         entity.translateX(horizontalSpeed);
 
         //The dinosaur shoots depending on the absolute value of its own speed on the current Level
 
-        if (shootTimer.elapsed(Duration.seconds(levelManager.getEnemySpawnRate()*1.3)))
-        {
+        if (gameTimer.isElapsed(Duration.seconds(levelManager.getEnemySpawnRate() * 1.3))) {
             shoot();
-            shootTimer.capture();
+            gameTimer.capture();
         }
     }
 
     /**
      * Summary :
-     *      This handles with the shooting of the dinosaur and spawning of the new bullet
+     * This handles with the shooting of the dinosaur and spawning of the new bullet
      */
     @Override
     public void shoot() {
-        if(!isMuted) {
+        if (!isMuted) {
             FXGL.play(GameConstants.ENEMY_SHOOT_SOUND);
         }
         Point2D center = entity.getCenter();
-        Vec2 direction = Vec2.fromAngle(entity.getRotation() + 90 + random(-45,45));
+        Vec2 direction = Vec2.fromAngle(entity.getRotation() + 90 + random(-45, 45));
         spawn("basicEnemyProjectile",
-                new SpawnData(center.getX() + 50 +3, center.getY())
-                        .put("direction", direction.toPoint2D() )
+                new SpawnData(center.getX() + 50 + 3, center.getY())
+                        .put("direction", direction.toPoint2D())
         );
     }