Remove option watcher, it’s not used anymore.

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

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 (file)
--- 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));
        }
 
 }