Refactor FCP interface test slightly

[Sone.git] / src / test / java / net / pterodactylus / sone / fcp / FcpInterfaceTest.java

diff --git a/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java b/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java
index 2c8a910..d1c31ad 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java
+++ b/src/test/java/net/pterodactylus/sone/fcp/FcpInterfaceTest.java
@@ -6,8 +6,10 @@ import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-import net.pterodactylus.sone.fcp.FcpInterface.SetActive;
-import net.pterodactylus.sone.fcp.FcpInterface.SetFullAccessRequired;
+import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
+import net.pterodactylus.sone.fcp.event.FcpInterfaceActivatedEvent;
+import net.pterodactylus.sone.fcp.event.FcpInterfaceDeactivatedEvent;
+import net.pterodactylus.sone.fcp.event.FullAccessRequiredChanged;
 
 import org.junit.Test;
 
@@ -19,37 +21,37 @@ import org.junit.Test;
 public class FcpInterfaceTest {
 
        private final FcpInterface fcpInterface = new FcpInterface(null);
-       private final SetActive setActive = fcpInterface.new SetActive();
-       private final SetFullAccessRequired setFullAccessRequired = fcpInterface.new SetFullAccessRequired();
 
        @Test
-       public void setActiveCanActivateFcpInterface() {
-               setActive.optionChanged(null, null, true);
+       public void fcpInterfaceCanBeActivated() {
+               fcpInterface.fcpInterfaceActivated(new FcpInterfaceActivatedEvent());
                assertThat(fcpInterface.isActive(), is(true));
        }
 
        @Test
-       public void setActiveCanDeactivateFcpInterface() {
-               setActive.optionChanged(null, null, false);
+       public void fcpInterfaceCanBeDeactivated() {
+               fcpInterface.fcpInterfaceDeactivated(new FcpInterfaceDeactivatedEvent());
                assertThat(fcpInterface.isActive(), is(false));
        }
 
+       private void setAndVerifyAccessRequired(FullAccessRequired fullAccessRequired) {
+               fcpInterface.fullAccessRequiredChanged(new FullAccessRequiredChanged(fullAccessRequired));
+               assertThat(fcpInterface.getFullAccessRequired(), is(fullAccessRequired));
+       }
+
        @Test
        public void setFullAccessRequiredCanSetAccessToNo() {
-               setFullAccessRequired.optionChanged(null, null, 0);
-               assertThat(fcpInterface.getFullAccessRequired(), is(NO));
+               setAndVerifyAccessRequired(NO);
        }
 
        @Test
        public void setFullAccessRequiredCanSetAccessToWriting() {
-               setFullAccessRequired.optionChanged(null, null, 1);
-               assertThat(fcpInterface.getFullAccessRequired(), is(WRITING));
+               setAndVerifyAccessRequired(WRITING);
        }
 
        @Test
        public void setFullAccessRequiredCanSetAccessToAlways() {
-               setFullAccessRequired.optionChanged(null, null, 2);
-               assertThat(fcpInterface.getFullAccessRequired(), is(ALWAYS));
+               setAndVerifyAccessRequired(ALWAYS);
        }
 
 }