X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FConfigurationSoneParserTest.java;h=7bbfae838c6b9671c04f21a1170cda25f0af00cf;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hp=c8742c24f42065756c75b8b928e2f625b5cbf461;hpb=527ba49512006908c5bae602e34a1ce7167ea3fe;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
index c8742c2..7bbfae8 100644
--- a/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
@@ -22,12 +22,12 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
 
 import net.pterodactylus.sone.TestAlbumBuilder;
 import net.pterodactylus.sone.TestImageBuilder;
 import net.pterodactylus.sone.TestPostBuilder;
 import net.pterodactylus.sone.TestPostReplyBuilder;
+import net.pterodactylus.sone.TestValue;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
@@ -48,8 +48,6 @@ import net.pterodactylus.sone.database.PostBuilderFactory;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilderFactory;
 import net.pterodactylus.util.config.Configuration;
-import net.pterodactylus.util.config.ConfigurationException;
-import net.pterodactylus.util.config.Value;
 
 import com.google.common.base.Optional;
 import org.hamcrest.Matchers;
@@ -90,9 +88,9 @@ public class ConfigurationSoneParserTest {
 
 	private void setupEmptyProfile() {
 		when(configuration.getStringValue(anyString())).thenReturn(
-				new TestValue<String>(null));
+				TestValue.<String>from(null));
 		when(configuration.getIntValue(anyString())).thenReturn(
-				new TestValue<Integer>(null));
+				TestValue.<Integer>from(null));
 	}
 
 	@Test
@@ -130,12 +128,12 @@ public class ConfigurationSoneParserTest {
 
 	private void setupString(String nodeName, String value) {
 		when(configuration.getStringValue(eq(nodeName))).thenReturn(
-				new TestValue<String>(value));
+				TestValue.from(value));
 	}
 
 	private void setupInteger(String nodeName, Integer value) {
 		when(configuration.getIntValue(eq(nodeName))).thenReturn(
-				new TestValue<Integer>(value));
+				TestValue.from(value));
 	}
 
 	@Test
@@ -182,7 +180,7 @@ public class ConfigurationSoneParserTest {
 
 	private void setupLong(String nodeName, Long value) {
 		when(configuration.getLongValue(eq(nodeName))).thenReturn(
-				new TestValue<Long>(value));
+				TestValue.from(value));
 	}
 
 	@Test(expected = InvalidPostFound.class)
@@ -523,30 +521,4 @@ public class ConfigurationSoneParserTest {
 		configurationSoneParser.parseImages(createImageBuilderFactory());
 	}
 
-	private static class TestValue<T> implements Value<T> {
-
-		private final AtomicReference<T> value = new AtomicReference<T>();
-
-		public TestValue(T originalValue) {
-			value.set(originalValue);
-		}
-
-		@Override
-		public T getValue() throws ConfigurationException {
-			return value.get();
-		}
-
-		@Override
-		public T getValue(T defaultValue) {
-			final T realValue = value.get();
-			return (realValue != null) ? realValue : defaultValue;
-		}
-
-		@Override
-		public void setValue(T newValue) throws ConfigurationException {
-			value.set(newValue);
-		}
-
-	}
-
 }