diff --git a/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java b/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java index f1ecb86..dcdb47d 100644 --- a/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java +++ b/src/main/java/de/jeyp91/tippligaforum/MatchesListCreator.java @@ -8,7 +8,7 @@ import org.json.simple.JSONObject; public class MatchesListCreator { - private JSONArray matches; + private final JSONObject matches = new JSONObject(); private final String country; private final String leagueName; @@ -21,10 +21,11 @@ public class MatchesListCreator { JSONObject leagueObject = (JSONObject) firstMatchAPIFootball.get("league"); this.country = leagueObject.get("country").toString(); this.leagueName = leagueObject.get("name").toString(); - populateMatches(matchesAPIFootball); + JSONArray matches = populateMatches(matchesAPIFootball); + this.matches.put("matches", matches); } - private void populateMatches(JSONArray matchesAPIFootball) { + private JSONArray populateMatches(JSONArray matchesAPIFootball) { JSONArray matches = new JSONArray(); for(Object matchAPIFootballObject : matchesAPIFootball) { JSONObject matchAPIFootball = (JSONObject) matchAPIFootballObject; @@ -50,10 +51,10 @@ public class MatchesListCreator { match.put("showTable", false); matches.add(match); } - this.matches = matches; + return matches; } - public JSONArray getMatches() { + public JSONObject getMatches() { return this.matches; } diff --git a/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java b/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java index 839fbba..50e1358 100644 --- a/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java +++ b/src/test/java/de/jeyp91/tippligaforum/MatchesListCreatorTest.java @@ -9,7 +9,7 @@ public class MatchesListCreatorTest { public void getMatchesTest2664() { MatchesListCreator creator = new MatchesListCreator(2664); String matches = creator.getMatchesBeautiful(); - System.out.println(matches); +// System.out.println(matches); } @Test diff --git a/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java b/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java index 6ddd342..e2f9005 100644 --- a/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java +++ b/src/test/java/de/jeyp91/tippligaforum/MatchesListForumUpdaterTest.java @@ -10,12 +10,12 @@ public class MatchesListForumUpdaterTest { @Test public void updateAllLeaguesTest() { MatchesListForumUpdater updater = new MatchesListForumUpdater(); - updater.updateAllLeagues(); +// updater.updateAllLeagues(); } @Test public void updateLeagueTest() { MatchesListForumUpdater updater = new MatchesListForumUpdater(); - updater.updateLeague(2755); +// updater.updateLeague(2743); } }