Merge "BUG-4236: resolve TODOs - part 1"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / device / listener / OpenflowProtocolListenerFullImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/listener/OpenflowProtocolListenerFullImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/listener/OpenflowProtocolListenerFullImplTest.java
index cb031b2388839992fb233efce8621d2f50467f51..b60c618e5f5cc20eee3124c46b2d77297b6e5b15 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/listener/OpenflowProtocolListenerFullImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/listener/OpenflowProtocolListenerFullImplTest.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.openflowplugin.impl.device.listener;
 
+import java.net.InetSocketAddress;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,13 +57,14 @@ public class OpenflowProtocolListenerFullImplTest {
     @Mock
     private ConnectionAdapter connectionAdapter;
 
-    private final String hwDescValue = "test-val";
     private final long xid = 42L;
 
     @Before
     public void setUp() {
         // place for mocking method's general behavior for HandshakeContext and ConnectionContext
         ofProtocolListener = new OpenflowProtocolListenerFullImpl(connectionAdapter, deviceReplyProcessor);
+        connectionAdapter.setMessageListener(ofProtocolListener);
+        Mockito.when(connectionAdapter.getRemoteAddress()).thenReturn(InetSocketAddress.createUnresolved("ofp-junit.example.org", 6663));
         Mockito.verify(connectionAdapter).setMessageListener(Matchers.any(OpenflowProtocolListener.class));
     }
 
@@ -103,7 +105,8 @@ public class OpenflowProtocolListenerFullImplTest {
         ExperimenterMessage experimenterMessage = new ExperimenterMessageBuilder()
                 .setVersion(OFConstants.OFP_VERSION_1_3).setXid(xid).build();
         ofProtocolListener.onExperimenterMessage(experimenterMessage);
-        // NOOP
+
+        Mockito.verify(deviceReplyProcessor).processExperimenterMessage(Matchers.<ExperimenterMessage>any());
     }
 
     /**
@@ -126,7 +129,9 @@ public class OpenflowProtocolListenerFullImplTest {
         HelloMessage helloMessage = new HelloMessageBuilder()
                 .setVersion(OFConstants.OFP_VERSION_1_3).setXid(xid).build();
         ofProtocolListener.onHelloMessage(helloMessage);
-        // NOOP
+
+        Mockito.verify(connectionAdapter).getRemoteAddress();
+        Mockito.verify(connectionAdapter).disconnect();
     }
 
     /**