Merge branch 'main' into league-modelleague-model

# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/main/java/design/model/ScrambleLeague.java
#	src/test/java/design/model/GolferTest.java
#	test.xml

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/design/persistence/JSONLeagueDatabase.java b/src/main/java/design/persistence/JSONLeagueDatabase.java
index 977e162..b5f4bc3 100644
--- a/src/main/java/design/persistence/JSONLeagueDatabase.java
+++ b/src/main/java/design/persistence/JSONLeagueDatabase.java
@@ -23,6 +23,12 @@ public class JSONLeagueDatabase implements LeagueDatabase {
         return INSTANCE;
     }
 
+    // static instance strictly for testing, to not add data to leaguedb.json
+    static JSONLeagueDatabase testInstance(String filename) {
+        INSTANCE = new JSONLeagueDatabase(filename);
+        return INSTANCE;
+    }
+
     private final Map<Integer, League> cache;
     private final ObjectMapper mapper;
     private final File file;