Merge branch 'main' of github.com:GioeleBucci/TBOOOP into nico-dev

Author: N1c0zz

src/main/java/tbooop/commons/impl/Point2dImpl.java

@@ -75,10 +75,7 @@ public double distance(final Point2d coord) {
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof Point2d) {
-            return this.vector.equals(toV2D((Point2d) obj));
-        }
-        return false;
+        return obj instanceof Point2d && this.vector.equals(toV2D((Point2d) obj));
     }
 
     /** {@inheritDoc} */

src/main/java/tbooop/commons/impl/Vector2dImpl.java

@@ -57,28 +57,25 @@ public double getLenght() {
     /** {@inheritDoc} */
     @Override
     public Vector2d normalize() {
-        return toVector(this.vector.normalize());
+        return toV2d(this.vector.normalize());
     }
 
     /** {@inheritDoc} */
     @Override
     public Vector2d negate() {
-        return toVector(this.vector.negate());
+        return toV2d(this.vector.negate());
     }
 
     /** {@inheritDoc} */
     @Override
     public Vector2d scalarMultiply(final double a) {
-        return toVector(this.vector.scalarMultiply(a));
+        return toV2d(this.vector.scalarMultiply(a));
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof Vector2d) {
-            return this.vector.equals(toV2D((Vector2d) obj));
-        }
-        return false;
+        return obj instanceof Vector2d && this.vector.equals(toV2D((Vector2d) obj));
     }
 
     /** {@inheritDoc} */
@@ -99,7 +96,7 @@ public Point2d toP2d() {
         return new Point2dImpl(getX(), getY());
     }
 
-    private Vector2d toVector(final Vector2D v) {
+    private Vector2d toV2d(final Vector2D v) {
         return new Vector2dImpl(v.getX(), v.getY());
     }
 

src/main/java/tbooop/model/player/api/Player.java

@@ -1,8 +1,6 @@
 package tbooop.model.player.api;
 
 import tbooop.model.core.api.movable.Entity;
-import tbooop.model.player.api.coin.PlayerCoin;
-import tbooop.model.player.api.key.PlayerKey;
 import tbooop.commons.api.CardinalDirection;
 import tbooop.commons.api.Vector2d;
 
@@ -11,7 +9,7 @@
  * a player can interact with an enemy trying to kill him or can collect
  * objects on the map.
 */
-public interface Player extends Entity, UnmodifiablePlayer, PlayerKey, PlayerCoin {
+public interface Player extends Entity, UnmodifiablePlayer {
 
     /**
      * Set the current health equals to the max health.
@@ -59,4 +57,35 @@ public interface Player extends Entity, UnmodifiablePlayer, PlayerKey, PlayerCoi
      * @param amount the amount to increase;
      */
     void increaseMaxHealth(int amount);
+
+    /**
+     * Adds the specified number of coins to the collection.
+     *
+     * @param coins the number of coins to add
+     */
+    void addCoins(int coins);
+
+    /**
+     * Consumes the specified number of coins from the collection.
+     *
+     * @param coins the number of coins to consume
+     */
+    void consumeCoins(int coins);
+
+    /**
+     * Indicates whether the collection has a key.
+     * 
+     * @return true if the collection has a key, otherwise false
+    */
+    boolean hasKey();
+
+    /**
+     * Decrement the number of key to the collection by 1.
+     */
+    void useKey();
+
+    /**
+     * Increment the number of key to the collection by 1.
+     */
+    void pickupKey();
 }

src/main/java/tbooop/view/api/Keybinds.java

@@ -129,7 +129,7 @@ public static boolean isMove(final Keybinds keybind) {
      */
     public static Optional<Keybinds> getKeybind(final KeyCode keyCode) {
         for (final Keybinds keybind : Keybinds.values()) {
-            if (keybind.getKeyCode() == keyCode) {
+            if (keybind.getKeyCode().equals(keyCode)) {
                 return Optional.of(keybind);
             }
         }

src/main/java/tbooop/view/player/HealthRender.java

@@ -45,17 +45,17 @@ public void addMaxHealth(final ImageView heartView, final HBox root) {
     private void bindHeart(final ImageView heartView, final HBox root) {
         root.getChildren().add(heartView);
 
-            heartView.fitWidthProperty()
-            .bind(root.getScene()
-            .widthProperty()
-            .multiply(heartView.getImage().getWidth() / root.getScene().widthProperty().get()));
-
-            heartView.fitHeightProperty()
-            .bind(root.getScene()
-            .heightProperty()
-            .multiply(heartView.getImage().getHeight() / root.getScene().heightProperty().get()));
-
-            heartView.setScaleX(HEART_SIZE);
-            heartView.setScaleY(HEART_SIZE);
+        heartView.fitWidthProperty()
+        .bind(root.getScene()
+        .widthProperty()
+        .multiply(heartView.getImage().getWidth() / root.getScene().widthProperty().get()));
+
+        heartView.fitHeightProperty()
+        .bind(root.getScene()
+        .heightProperty()
+        .multiply(heartView.getImage().getHeight() / root.getScene().heightProperty().get()));
+
+        heartView.setScaleX(HEART_SIZE);
+        heartView.setScaleY(HEART_SIZE);
     }
 }

src/test/java/tbooop/AppTest.java

@@ -0,0 +1,37 @@
+package tbooop.model.player;
+
+import org.junit.jupiter.api.Test;
+
+import tbooop.model.player.impl.BasePlayerCoinImpl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeAll;
+
+class BasePlayerCoinImplTest {
+
+    private static final int TEST_COIN = 50;
+    private static final int MAX_COIN = 200;
+    private static BasePlayerCoinImpl playerCoin;
+
+    @BeforeAll
+    static void setUp() {
+        playerCoin = new BasePlayerCoinImpl();
+    }
+
+    @Test
+    void addCoins() {
+        final int initialCoinCount = playerCoin.getCoins();
+        final int coinsToAdd = TEST_COIN;
+        playerCoin.addCoins(coinsToAdd);
+        assertEquals(initialCoinCount + coinsToAdd, playerCoin.getCoins());
+    }
+
+    @Test
+    void addOverMax() {
+        final int initialCoinCount = playerCoin.getCoins();
+        final int coinsToAdd = MAX_COIN + TEST_COIN;
+        playerCoin.addCoins(coinsToAdd);
+        assertEquals(initialCoinCount, playerCoin.getCoins());
+    }
+}

src/test/java/tbooop/model/player/BasePlayerCoinImplTest.java

@@ -0,0 +1,37 @@
+package tbooop.model.player;
+
+import org.junit.jupiter.api.Test;
+
+import tbooop.model.player.impl.BasePlayerKeyImpl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.BeforeAll;
+
+class BasePlayerKeyImplTest {
+
+    private static final int MAX_KEYS = 20;
+    private static BasePlayerKeyImpl playerKey;
+
+    @BeforeAll
+    static void setUp() {
+        playerKey = new BasePlayerKeyImpl();
+    }
+
+    @Test
+    void pickupKey() {
+        final int initialKeyCount = playerKey.getKey();
+        playerKey.pickupKey();
+        assertEquals(initialKeyCount + 1, playerKey.getKey());
+    }
+
+    @Test
+    void pickupToMax() {
+        final int initialKeyCount = playerKey.getKey();
+        for (int i = initialKeyCount; i < MAX_KEYS; i++) {
+            playerKey.pickupKey();
+        }
+        playerKey.pickupKey();
+        assertEquals(MAX_KEYS, playerKey.getKey());
+    }
+}