fix: load missing total coin count from file and update tests accordingly

Author: dybyte

src/main/java/com/dinosaur/dinosaurexploder/model/GameData.java

@@ -63,7 +63,7 @@ public static int getHighScore() {
 
     // Getter for total coins
     public static int getTotalCoins() {
-        totalCoins = shipUnlockChecker.getTotalCoins().getTotal();
+        totalCoins = new FileDataProvider().getTotalCoins().getTotal();
         System.out.println("Total: " + totalCoins);
         return totalCoins;
     }

src/main/java/com/dinosaur/dinosaurexploder/utils/DataProvider.java

@@ -1,7 +1,10 @@
 package com.dinosaur.dinosaurexploder.utils;
 
 import com.dinosaur.dinosaurexploder.model.HighScore;
+import com.dinosaur.dinosaurexploder.model.TotalCoins;
 
 public interface DataProvider {
     HighScore getHighScore();
+
+    TotalCoins getTotalCoins();
 }

src/main/java/com/dinosaur/dinosaurexploder/utils/FileDataProvider.java

@@ -1,6 +1,7 @@
 package com.dinosaur.dinosaurexploder.utils;
 
 import com.dinosaur.dinosaurexploder.model.HighScore;
+import com.dinosaur.dinosaurexploder.model.TotalCoins;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -16,4 +17,14 @@ public HighScore getHighScore() {
             return new HighScore();
         }
     }
+
+    @Override
+    public TotalCoins getTotalCoins() {
+        try (FileInputStream file = new FileInputStream("totalCoins.ser");
+             ObjectInputStream in = new ObjectInputStream(file)) {
+            return (TotalCoins) in.readObject();
+        } catch (IOException | ClassNotFoundException e) {
+            return new TotalCoins();
+        }
+    }
 }

src/main/java/com/dinosaur/dinosaurexploder/utils/ShipUnlockChecker.java

@@ -4,9 +4,6 @@
 import com.dinosaur.dinosaurexploder.model.HighScore;
 import com.dinosaur.dinosaurexploder.model.TotalCoins;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.util.Map;
 
 public class ShipUnlockChecker {
@@ -48,16 +45,9 @@ public int check(int shipNumber) {
         return shipNumber;
     }
 
-    public TotalCoins getTotalCoins() {
-        try (FileInputStream file = new FileInputStream("totalCoins.ser");
-             ObjectInputStream in = new ObjectInputStream(file)) {
-            return (TotalCoins) in.readObject();
-        } catch (IOException | ClassNotFoundException e) {
-            return new TotalCoins();
-        }
-    }
-
     private void checkScoreAndCoins(int shipNumber) {
+        totalCoins = dataProvider.getTotalCoins();
+
         int lowerScoreLimit = scoreMap.getOrDefault(shipNumber, 0);
         int lowerCoinLimit = coinMap.getOrDefault(shipNumber, 0);
 

src/main/java/com/dinosaur/dinosaurexploder/utils/WeaponUnlockChecker.java

@@ -37,17 +37,9 @@ public int check(int weaponNumber) {
         return weaponNumber;
     }
 
-
-    public TotalCoins getTotalCoins() {
-        try (FileInputStream file = new FileInputStream("totalCoins.ser");
-             ObjectInputStream in = new ObjectInputStream(file)) {
-            return (TotalCoins) in.readObject();
-        } catch (IOException | ClassNotFoundException e) {
-            return new TotalCoins();
-        }
-    }
-
     private void checkScoreAndCoins(int weaponNumber) {
+        totalCoins = dataProvider.getTotalCoins();
+
         int lowerScoreLimit = scoreMap.getOrDefault(weaponNumber, 0);
         int lowerCoinLimit = coinMap.getOrDefault(weaponNumber, 0);
 

src/test/java/com/dinosaur/dinosaurexploder/model/SelectionTest.java

@@ -13,6 +13,7 @@ class SelectionTest {
     public static final int HIGH_SCORE = 100;
     public static final int UNLOCKED_WEAPON_HIGHER_LIMIT = 2;
     public static final int UNLOCKED_SHIP_HIGHER_LIMIT = 3;
+    public static final int TOTAL_COINS = 10;
 
     @Test
     void cannotSelectLockedShip() {
@@ -43,5 +44,10 @@ class MockDataProvider implements DataProvider {
         public HighScore getHighScore() {
             return new HighScore(HIGH_SCORE);
         }
+
+        @Override
+        public TotalCoins getTotalCoins() {
+            return new TotalCoins(TOTAL_COINS);
+        }
     }
 }