From 1903709f2043e0358fdcb14721b095c42a5687ef Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 5 Dec 2019 18:44:07 +0200 Subject: [PATCH] Tests now work again, yay --- .../tomgrill/gdxtesting/examples/BasicTests.java | 2 +- .../gdxtesting/examples/TranslationTests.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/src/de/tomgrill/gdxtesting/examples/BasicTests.java b/tests/src/de/tomgrill/gdxtesting/examples/BasicTests.java index b312b6b3b6..9021507c47 100644 --- a/tests/src/de/tomgrill/gdxtesting/examples/BasicTests.java +++ b/tests/src/de/tomgrill/gdxtesting/examples/BasicTests.java @@ -26,7 +26,7 @@ public class BasicTests { @Test public void gameBasicsLoad() { assertTrue("This test will only pass when the jsons can be loaded", - RuleSet.INSTANCE.getBuildings().size() > 0); + new RuleSet().getBuildings().size() > 0); } diff --git a/tests/src/de/tomgrill/gdxtesting/examples/TranslationTests.java b/tests/src/de/tomgrill/gdxtesting/examples/TranslationTests.java index 6893a362d3..f1a25b4069 100644 --- a/tests/src/de/tomgrill/gdxtesting/examples/TranslationTests.java +++ b/tests/src/de/tomgrill/gdxtesting/examples/TranslationTests.java @@ -21,26 +21,26 @@ public class TranslationTests { @Test public void translationsLoad() { assertTrue("This test will only pass there are translations", - RuleSet.INSTANCE.getTranslations().size() > 0); + new RuleSet().getTranslations().size() > 0); } @Test public void allUnitsHaveTranslation() { - Boolean allUnitsHaveTranslation = allStringAreTranslated(RuleSet.INSTANCE.getUnits().keySet()); + Boolean allUnitsHaveTranslation = allStringAreTranslated(new RuleSet().getUnits().keySet()); assertTrue("This test will only pass when there is a translation for all units", allUnitsHaveTranslation); } @Test public void allBuildingsHaveTranslation() { - Boolean allBuildingsHaveTranslation = allStringAreTranslated(RuleSet.INSTANCE.getBuildings().keySet()); + Boolean allBuildingsHaveTranslation = allStringAreTranslated(new RuleSet().getBuildings().keySet()); assertTrue("This test will only pass when there is a translation for all buildings", allBuildingsHaveTranslation); } @Test public void allTerrainsHaveTranslation() { - Set strings = RuleSet.INSTANCE.getTerrains().keySet(); + Set strings = new RuleSet().getTerrains().keySet(); Boolean allStringsHaveTranslation = allStringAreTranslated(strings); assertTrue("This test will only pass when there is a translation for all buildings", allStringsHaveTranslation); @@ -48,7 +48,7 @@ public class TranslationTests { @Test public void allImprovementsHaveTranslation() { - Set strings = RuleSet.INSTANCE.getTileImprovements().keySet(); + Set strings = new RuleSet().getTileImprovements().keySet(); Boolean allStringsHaveTranslation = allStringAreTranslated(strings); assertTrue("This test will only pass when there is a translation for all improvements", allStringsHaveTranslation); @@ -56,7 +56,7 @@ public class TranslationTests { @Test public void allTechnologiesHaveTranslation() { - Set strings = RuleSet.INSTANCE.getTechnologies().keySet(); + Set strings = new RuleSet().getTechnologies().keySet(); Boolean allStringsHaveTranslation = allStringAreTranslated(strings); assertTrue("This test will only pass when there is a translation for all technologies", allStringsHaveTranslation); @@ -64,7 +64,7 @@ public class TranslationTests { @Test public void allPromotionsHaveTranslation() { - Set strings = RuleSet.INSTANCE.getUnitPromotions().keySet(); + Set strings = new RuleSet().getUnitPromotions().keySet(); Boolean allStringsHaveTranslation = allStringAreTranslated(strings); assertTrue("This test will only pass when there is a translation for all promotions", allStringsHaveTranslation); @@ -73,7 +73,7 @@ public class TranslationTests { private Boolean allStringAreTranslated(Set strings) { boolean allBuildingsHaveTranslation = true; for (String unitName : strings) { - if (!RuleSet.INSTANCE.getTranslations().containsKey(unitName)) { + if (!new RuleSet().getTranslations().containsKey(unitName)) { allBuildingsHaveTranslation = false; System.out.println(unitName); }