X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FPreferencesLoaderTest.java;h=d550f25b670afe8e4c1e02634c7e5824a99c6ec9;hp=91120fb0ed7a26714df45e88cfbb54870e9776db;hb=b4d2d68b5ea4f4edc7337f380cfe078756678126;hpb=c5fff3247c8a680f816db28df64d6439779f5c82

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
--- 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)));
+	}
+
 }