QPID-2623 : Simple changes to classes that extended TestCase, now they extend InternalBrokerBaseCase.

Fixed up @Override on setUp/tearDowns removed setUp/tearDowns that were simply super calls.
Corrected existing setUp/tearDowns to call super.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@950644 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 11 deletions

diff --git a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java b/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
index f94443228e..431da470e0 100644
--- a/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
+++ b/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
@@ -24,19 +24,16 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import junit.framework.TestCase;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.qpid.server.protocol.AMQProtocolEngine;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.security.Result;
 import org.apache.qpid.server.security.access.plugins.Firewall;
 import org.apache.qpid.server.security.access.plugins.FirewallConfiguration;
-import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
-import org.apache.qpid.transport.TestNetworkDriver;
+import org.apache.qpid.server.util.InternalBrokerBaseCase;
 
-public class FirewallPluginTest extends TestCase
+public class FirewallPluginTest extends InternalBrokerBaseCase
 {
     public class RuleInfo
     {
@@ -89,12 +86,6 @@ public class FirewallPluginTest extends TestCase
         ApplicationRegistry.getInstance();
     }
 
-    public void tearDown() throws Exception
-    {
-        // Correctly Close the AR that we created above
-        ApplicationRegistry.remove();
-        super.tearDown();
-    }
 
     private Firewall initialisePlugin(String defaultAction, RuleInfo[] rules) throws IOException, ConfigurationException
     {