commit 2266bff9e5819afe1542bc6381dc8bf631e9736d
author Jian Li <pyguni@gmail.com> Thu Apr 21 11:01:25 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Apr 22 16:00:05 2016 +0000
tree 7848c682d414992294384d4af663ffe0190b8f58
parent c99d430746a7b8b06770147585e282c81fc2c327

[ONOS-4385] Handle flow removed message type in all cases

- Do not handle packet in messages inside ControllerImpl class

Change-Id: Idcb26b277b790125bd6b3ba8f10bb4c60e2a3c58

protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java

diff --git a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java
index ca9a1a8..d87913a 100644
--- a/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java
+++ b/protocols/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImplPacketsTest.java
@@ -19,7 +19,6 @@
 import org.junit.Test;
 import org.onosproject.openflow.ExecutorServiceAdapter;
 import org.onosproject.openflow.MockOfFeaturesReply;
-import org.onosproject.openflow.MockOfPacketIn;
 import org.onosproject.openflow.MockOfPortStatus;
 import org.onosproject.openflow.OfMessageAdapter;
 import org.onosproject.openflow.OpenFlowSwitchListenerAdapter;
@@ -38,7 +37,9 @@
 
 import static junit.framework.TestCase.fail;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
 
 /**
  * Tests for packet processing in the open flow controller impl class.
@@ -51,8 +52,6 @@
     OpenFlowSwitchListenerAdapter switchListener;
     TestPacketListener packetListener;
     TestExecutorService statsExecutorService;
-    TestExecutorService pktInExecutorService;
-    TestExecutorService flowRmvExecutorService;
 
     /**
      * Mock packet listener that accumulates packets.
@@ -70,7 +69,6 @@
         }
     }
 
-
     /**
      * Mock executor service that tracks submits.
      */
@@ -112,13 +110,8 @@
         controller.addPacketListener(100, packetListener);
 
         statsExecutorService = new TestExecutorService();
-        pktInExecutorService = new TestExecutorService();
-        flowRmvExecutorService = new TestExecutorService();
 
         controller.executorMsgs = statsExecutorService;
-        controller.executorPacketIn = pktInExecutorService;
-        controller.executorFlowRemoved = flowRmvExecutorService;
-
     }
 
     /**
@@ -148,19 +141,6 @@
     }
 
     /**
-     * Tests a packet in listen operation.
-     */
-    @Test
-    public void testPacketInListen() {
-        agent.addConnectedSwitch(dpid1, switch1);
-        OFMessage packetInPacket = new MockOfPacketIn();
-        controller.processPacket(dpid1, packetInPacket);
-        assertThat(packetListener.contexts(), hasSize(1));
-        assertThat(pktInExecutorService.submittedMessages(), hasSize(1));
-        assertThat(pktInExecutorService.submittedMessages().get(0), is(packetInPacket));
-    }
-
-    /**
      * Tests an error operation.
      */
     @Test
@@ -171,16 +151,4 @@
         assertThat(statsExecutorService.submittedMessages(), hasSize(1));
         assertThat(statsExecutorService.submittedMessages().get(0), is(errorPacket));
     }
-
-    /**
-     * Tests a packet in operation.
-     */
-    @Test
-    public void testFlowRemoved() {
-        agent.addConnectedSwitch(dpid1, switch1);
-        OFMessage flowRemovedPacket = new MockOfFlowRemoved();
-        controller.processPacket(dpid1, flowRemovedPacket);
-        assertThat(flowRmvExecutorService.submittedMessages(), hasSize(1));
-        assertThat(flowRmvExecutorService.submittedMessages().get(0), is(flowRemovedPacket));
-    }
 }