Merge branch 'release-0.9.6'

[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..2312907 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,9 @@ 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.event.FcpInterfaceActivatedEvent;
+import net.pterodactylus.sone.fcp.event.FcpInterfaceDeactivatedEvent;
+import net.pterodactylus.sone.fcp.event.FullAccessRequiredChanged;
 
 import org.junit.Test;
 
@@ -19,36 +20,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));
        }
 
        @Test
        public void setFullAccessRequiredCanSetAccessToNo() {
-               setFullAccessRequired.optionChanged(null, null, 0);
+               fcpInterface.fullAccessRequiredChanged(
+                               new FullAccessRequiredChanged(NO));
                assertThat(fcpInterface.getFullAccessRequired(), is(NO));
        }
 
        @Test
        public void setFullAccessRequiredCanSetAccessToWriting() {
-               setFullAccessRequired.optionChanged(null, null, 1);
+               fcpInterface.fullAccessRequiredChanged(
+                               new FullAccessRequiredChanged(WRITING));
                assertThat(fcpInterface.getFullAccessRequired(), is(WRITING));
        }
 
        @Test
        public void setFullAccessRequiredCanSetAccessToAlways() {
-               setFullAccessRequired.optionChanged(null, null, 2);
+               fcpInterface.fullAccessRequiredChanged(
+                               new FullAccessRequiredChanged(ALWAYS));
                assertThat(fcpInterface.getFullAccessRequired(), is(ALWAYS));
        }