🔀 Merge branch “release-80”

[Sone.git] / src / test / java / net / pterodactylus / sone / core / PreferencesLoaderTest.java

diff --git a/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java b/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java
index 91120fb..d550f25 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/PreferencesLoaderTest.java
@@ -3,10 +3,11 @@ package net.pterodactylus.sone.core;
 import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+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;
@@ -15,8 +16,6 @@ import org.junit.Test;
 
 /**
  * Unit test for {@link PreferencesLoader}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class PreferencesLoaderTest {
 
@@ -37,20 +36,20 @@ public class PreferencesLoaderTest {
                setupIntValue("PositiveTrust", 50);
                setupIntValue("NegativeTrust", -50);
                when(configuration.getStringValue("Option/TrustComment")).thenReturn(
-                               new TestValue<String>("Trusted"));
+                               TestValue.from("Trusted"));
                setupBooleanValue("ActivateFcpInterface", true);
                setupIntValue("FcpFullAccessRequired", 1);
        }
 
        private void setupIntValue(String optionName, int value) {
                when(configuration.getIntValue("Option/" + optionName)).thenReturn(
-                               new TestValue<Integer>(value));
+                               TestValue.from(value));
        }
 
        private void setupBooleanValue(String optionName, boolean value) {
                when(configuration.getBooleanValue(
                                "Option/" + optionName)).thenReturn(
-                               new TestValue<Boolean>(value));
+                               TestValue.from(value));
        }
 
        @Test
@@ -62,12 +61,20 @@ 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.getRequireFullAccess(), is(true));
                assertThat(preferences.getPositiveTrust(), is(50));
                assertThat(preferences.getNegativeTrust(), is(-50));
                assertThat(preferences.getTrustComment(), is("Trusted"));
-               assertThat(preferences.isFcpInterfaceActive(), is(true));
+               assertThat(preferences.getFcpInterfaceActive(), is(true));
                assertThat(preferences.getFcpFullAccessRequired(), is(WRITING));
        }
 
+       @Test
+       public void configurationIsLoadedCorrectlyWithCutOffLengthMinusOne() {
+           setupConfiguration();
+               setupIntValue("PostCutOffLength", -1);
+               preferencesLoader.loadFrom(configuration);
+               assertThat(preferences.getPostCutOffLength(), not(is(-1)));
+       }
+
 }