diff --git a/client/src/test/java/client/scenes/ConfigTest.java b/client/src/test/java/client/scenes/ConfigTest.java index 9c82d34..3ba44ff 100644 --- a/client/src/test/java/client/scenes/ConfigTest.java +++ b/client/src/test/java/client/scenes/ConfigTest.java @@ -1,9 +1,6 @@ package client.scenes; import client.utils.Config; -import client.utils.ServerUtils; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -11,22 +8,15 @@ import java.util.ArrayList; import static org.junit.jupiter.api.Assertions.*; public class ConfigTest { - static ServerUtils dv = new ServerUtils(); private static final long FAV_LIST_ID_1 = 1234L; private static final long FAV_LIST_ID_2 = 1235L; - @BeforeEach - public void setup(){ - Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available"); - } - - @Test public void configDefaultValueTest(){ - Config config = new Config(); + assertEquals("en", config.getLanguage()); assertEquals("http://localhost:8080", config.getServerUrl()); assertTrue(config.getFavourites().isEmpty()); @@ -38,13 +28,16 @@ public class ConfigTest { Config config = new Config(); config.setLanguage("nl"); config.setServerUrl("http://localhost:8081"); + ArrayList x = new ArrayList<>(); x.add("Lava Cake"); x.add("Brownie"); + ArrayList y = new ArrayList<>(); y.add(FAV_LIST_ID_1); y.add(FAV_LIST_ID_2); config.setFavourites(y); + assertEquals(config.getFavourites(), y); config.setShoppingList(x); assertEquals(config.getShoppingList(), x); diff --git a/client/src/test/java/client/scenes/PrintExportTest.java b/client/src/test/java/client/scenes/PrintExportTest.java index 3fa93ee..6b48be7 100644 --- a/client/src/test/java/client/scenes/PrintExportTest.java +++ b/client/src/test/java/client/scenes/PrintExportTest.java @@ -2,11 +2,9 @@ package client.scenes; import client.utils.DefaultValueFactory; import client.utils.PrintExportService; -import client.utils.ServerUtils; import commons.Recipe; import commons.RecipeIngredient; -import org.junit.jupiter.api.Assumptions; -import org.junit.jupiter.api.BeforeEach; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -19,11 +17,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.*; public class PrintExportTest { - static ServerUtils dv = new ServerUtils(); - @BeforeEach - public void setup(){ - Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available"); - } + @Test public void buildRecipeTextTest(){