X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FDefaultOptionTest.java;h=6c4bf66fb2ae81eee859547464b2ec3bb9d82580;hb=3f91e22e512f81a2e11fa584e30f83da74e62177;hp=d7ca110a051b8b8e1a56b7de384832fc7f59305c;hpb=ad5d4046c53129d23b3acf4eb6aa8643dbef2f86;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/core/DefaultOptionTest.java b/src/test/java/net/pterodactylus/sone/core/DefaultOptionTest.java
index d7ca110..6c4bf66 100644
--- a/src/test/java/net/pterodactylus/sone/core/DefaultOptionTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/DefaultOptionTest.java
@@ -11,7 +11,6 @@ import javax.annotation.Nullable;
 
 import net.pterodactylus.sone.core.Options.DefaultOption;
 import net.pterodactylus.sone.core.Options.Option;
-import net.pterodactylus.sone.core.Options.OptionWatcher;
 
 import com.google.common.base.Predicate;
 import org.junit.Test;
@@ -66,41 +65,29 @@ public class DefaultOptionTest {
 	}
 
 	@Test
-	public void watcherIsNotifiedOnChange() {
-		final AtomicReference<Object> changedObject = new AtomicReference<Object>();
-		Object newValue = new Object();
-		DefaultOption<Object> defaultOption = new DefaultOption<Object>(defaultValue, new OptionWatcher<Object>() {
-			@Override
-			public void optionChanged(Option<Object> option, Object oldValue, Object newValue) {
-				assertThat(oldValue, nullValue());
-				changedObject.set(newValue);
-			}
-		});
-		defaultOption.set(newValue);
-		assertThat(defaultOption.get(), is(newValue));
-		assertThat(changedObject.get(), is(newValue));
+	public void defaultOptionValidatesObjectsCorrectly() {
+		DefaultOption<Object> defaultOption = new DefaultOption<Object>(defaultValue, matchesAcceptedValue);
+		assertThat(defaultOption.validate(acceptedValue), is(true));
+		assertThat(defaultOption.validate(new Object()), is(false));
 	}
 
 	@Test
-	public void watcherIsNotNotifiedIfValueIsSetTwice() {
-		final AtomicInteger changeCounter = new AtomicInteger();
-		Object newValue = new Object();
-		DefaultOption<Object> defaultOption = new DefaultOption<Object>(defaultValue, new OptionWatcher<Object>() {
-			@Override
-			public void optionChanged(Option<Object> option, Object oldValue, Object newValue) {
-				changeCounter.incrementAndGet();
-			}
-		});
-		defaultOption.set(newValue);
-		defaultOption.set(newValue);
-		assertThat(changeCounter.get(), is(1));
+	public void settingToNullWillRestoreDefaultValue() {
+		DefaultOption<Object> defaultOption = new DefaultOption<Object>(defaultValue);
+		defaultOption.set(null);
+		assertThat(defaultOption.get(), is(defaultValue));
 	}
 
 	@Test
-	public void defaultOptionValidatesObjectsCorrectly() {
+	public void validateWithoutValidatorWillValidateNull() {
+		DefaultOption<Object> defaultOption = new DefaultOption<Object>(defaultValue);
+		assertThat(defaultOption.validate(null), is(true));
+	}
+
+	@Test
+	public void validateWithValidatorWillValidateNull() {
 		DefaultOption<Object> defaultOption = new DefaultOption<Object>(defaultValue, matchesAcceptedValue);
-		assertThat(defaultOption.validate(acceptedValue), is(true));
-		assertThat(defaultOption.validate(new Object()), is(false));
+		assertThat(defaultOption.validate(null), is(true));
 	}
 
 }