Fixed some unit test dependency issues where there are multiple @Before annotated methods.

src/test/java/net/floodlightcontroller/core/OFSwitchBaseTest.java

@@ -154,9 +154,9 @@ public class OFSwitchBaseTest {
         switches.put(sw.getId(), sw);
         reset(switchManager);
         //expect(switchManager.getSwitch(sw.getId())).andReturn(sw).anyTimes();
+        setUpPorts();
     }
 
-    @Before
     public void setUpPorts() {
         OFPortDesc.Builder pdb = OFFactories.getFactory(OFVersion.OF_13).buildPortDesc();
         // p1a is disabled

src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerVer10Test.java

@@ -92,7 +92,6 @@ public class OFChannelHandlerVer10Test {
     private Capture<IOFConnectionBackend> newConnection;
     private Capture<OFFeaturesReply> newFeaturesReply;
 
-    @Before
     public void setUpFeaturesReply() {
        portDesc = factory.buildPortDesc()
                 .setName("Eth1")
@@ -111,6 +110,7 @@ public class OFChannelHandlerVer10Test {
 
     @Before
     public void setUp() throws Exception {
+    	setUpFeaturesReply();
         switchManager = createMock(IOFSwitchManager.class);
         connectionListener = createMock(IOFConnectionListener.class);
         newConnectionListener = createMock(INewOFConnectionListener.class);

src/test/java/net/floodlightcontroller/core/internal/OFChannelHandlerVer13Test.java

@@ -96,7 +96,6 @@ public class OFChannelHandlerVer13Test {
 
     private Capture<OFFeaturesReply> newFeaturesReply;
 
-    @Before
     public void setUpFeaturesReply() {
         portDesc = factory.buildPortDesc()
                 .setName("Eth1")
@@ -113,6 +112,7 @@ public class OFChannelHandlerVer13Test {
 
     @Before
     public void setUp() throws Exception {
+    	setUpFeaturesReply();
         switchManager = createMock(IOFSwitchManager.class);
         connectionListener = createMock(IOFConnectionListener.class);
         newConnectionListener = createMock(INewOFConnectionListener.class);