X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FPreferencesLoaderTest.java;h=72831fc15585ae68c2b8ff88033288c340aa82ad;hb=389a44126f3005c5423993afa588a18ae8df566d;hp=88745df1b3bdeb5363a34a83af8d2193eab3cdb8;hpb=82e3b3261d2fc90d3893df6d417a2828ce5f8ab3;p=Sone.git
diff --git a/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java b/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java
index 88745df..72831fc 100644
--- a/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java
@@ -7,7 +7,7 @@ import static org.hamcrest.Matchers.not;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import net.pterodactylus.sone.TestValue;
+import net.pterodactylus.sone.test.TestValue;
import net.pterodactylus.util.config.Configuration;
import com.google.common.eventbus.EventBus;
@@ -16,8 +16,6 @@ import org.junit.Test;
/**
* Unit test for {@link PreferencesLoader}.
- *
- * @author David âBombeâ Roden
*/
public class PreferencesLoaderTest {
@@ -35,23 +33,19 @@ public class PreferencesLoaderTest {
setupIntValue("CharactersPerPost", 150);
setupIntValue("PostCutOffLength", 300);
setupBooleanValue("RequireFullAccess", true);
- setupIntValue("PositiveTrust", 50);
- setupIntValue("NegativeTrust", -50);
- when(configuration.getStringValue("Option/TrustComment")).thenReturn(
- new TestValue("Trusted"));
setupBooleanValue("ActivateFcpInterface", true);
setupIntValue("FcpFullAccessRequired", 1);
}
private void setupIntValue(String optionName, int value) {
when(configuration.getIntValue("Option/" + optionName)).thenReturn(
- new TestValue(value));
+ TestValue.from(value));
}
private void setupBooleanValue(String optionName, boolean value) {
when(configuration.getBooleanValue(
"Option/" + optionName)).thenReturn(
- new TestValue(value));
+ TestValue.from(value));
}
@Test
@@ -63,11 +57,8 @@ public class PreferencesLoaderTest {
assertThat(preferences.getImagesPerPage(), is(12));
assertThat(preferences.getCharactersPerPost(), is(150));
assertThat(preferences.getPostCutOffLength(), is(300));
- assertThat(preferences.isRequireFullAccess(), is(true));
- assertThat(preferences.getPositiveTrust(), is(50));
- assertThat(preferences.getNegativeTrust(), is(-50));
- assertThat(preferences.getTrustComment(), is("Trusted"));
- assertThat(preferences.isFcpInterfaceActive(), is(true));
+ assertThat(preferences.getRequireFullAccess(), is(true));
+ assertThat(preferences.getFcpInterfaceActive(), is(true));
assertThat(preferences.getFcpFullAccessRequired(), is(WRITING));
}