From b65ed726c722f423a5ac4aad44a00144a26bdbdf Mon Sep 17 00:00:00 2001 From: Oystein Date: Mon, 26 Apr 2021 20:08:46 +0200 Subject: [PATCH] settings --- .../java/app/settings/SettingsProvider.java | 8 ++--- .../app/settings/SettingsProviderTest.java | 33 ++++++++++++++----- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/main/java/app/settings/SettingsProvider.java b/src/main/java/app/settings/SettingsProvider.java index a71d255..35cc92f 100644 --- a/src/main/java/app/settings/SettingsProvider.java +++ b/src/main/java/app/settings/SettingsProvider.java @@ -17,14 +17,14 @@ import app.model.Model; public class SettingsProvider implements SettingsProviderI { - private static EventBus eventBus; + private EventBus eventBus; - private static final String SETTINGS_PATH = + private String SETTINGS_PATH = (System.getProperty("os.name").startsWith("Windows")) ? System.getProperty("user.home") + "\\AppData\\Roaming\\/BNNsettings.dat" : System.getProperty("user.home") + System.getProperty("file.separator") + ".BNNsettings.dat"; - private static List legalSettings = + private List legalSettings = Arrays.asList("Java", "Markdown", "Monokai", "Solarized Light"); @@ -35,7 +35,7 @@ public class SettingsProvider implements SettingsProviderI { public void setEventBus(EventBus eB) { eventBus = eB; - SettingsProvider.eventBus.register(this); + eventBus.register(this); } @Override diff --git a/src/test/java/app/settings/SettingsProviderTest.java b/src/test/java/app/settings/SettingsProviderTest.java index f5bad89..13f30e9 100644 --- a/src/test/java/app/settings/SettingsProviderTest.java +++ b/src/test/java/app/settings/SettingsProviderTest.java @@ -1,21 +1,35 @@ package app.settings; + + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; + +import com.google.common.eventbus.EventBus; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.mockito.InjectMocks; +import org.mockito.Mock; public class SettingsProviderTest { + @TempDir + File tmp; + @Mock - private static final String SETTINGS_PATH = - (System.getProperty("os.name").startsWith("Windows")) - ? System.getProperty("user.home") + "\\AppData\\Roaming\\/BNNsettings.dat" - : System.getProperty("user.home") + System.getProperty("file.separator") + ".BNNsettings.dat"; + private String SETTINGS_PATH = Paths.get(tmp.toPath().toString(), "BNNsetting.dat").toString(); + @Mock - private static List legalSettings = + private List legalSettings = Arrays.asList("Java", "Markdown", "Monokai", "Solarized Light"); - private static EventBus eventBus; + private EventBus eventBus; @InjectMocks @@ -23,9 +37,10 @@ public class SettingsProviderTest { @Test @DisplayName("Test load settings") - public void testLoadSettings() { - sp.when() - + public void testLoadSettings() throws IOException { + File f = new File(tmp, "test.txt"); + f.createNewFile(); + } @Test