summaryrefslogtreecommitdiff
path: root/java/broker-plugins/firewall/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-06-03 21:26:15 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-06-03 21:26:15 +0000
commit9bcd23b23e46bb94761611f65d1afddfb927a94a (patch)
tree2471a9200a3fcd9a2d992ae8f1f8eb110b2b9ba3 /java/broker-plugins/firewall/src
parent18fd084c0db4ac659630bc51fddebe668cd2876f (diff)
downloadqpid-python-9bcd23b23e46bb94761611f65d1afddfb927a94a.tar.gz
QPID-2632 : Ensure additional broker unit tests extend IBBC
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951157 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/firewall/src')
-rw-r--r--java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java17
1 files changed, 2 insertions, 15 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 ab340ab849..89dba035e4 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
@@ -27,7 +27,7 @@ import java.net.InetSocketAddress;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.configuration.ServerConfiguration;
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;
@@ -73,18 +73,7 @@ public class FirewallPluginTest extends InternalBrokerBaseCase
}
// IP address
- private String _address;
-
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
-
- _address = "127.0.0.1";
-
- // Create new ApplicationRegistry
- ApplicationRegistry.getInstance();
- }
+ private String _address= "127.0.0.1";
private Firewall initialisePlugin(String defaultAction, RuleInfo[] rules) throws IOException, ConfigurationException
@@ -93,7 +82,6 @@ public class FirewallPluginTest extends InternalBrokerBaseCase
File confFile = File.createTempFile(getClass().getSimpleName()+"conffile", null);
confFile.deleteOnExit();
BufferedWriter buf = new BufferedWriter(new FileWriter(confFile));
- buf.write("<security>\n");
buf.write("<firewall default-action=\""+defaultAction+"\">\n");
if (rules != null)
{
@@ -113,7 +101,6 @@ public class FirewallPluginTest extends InternalBrokerBaseCase
}
}
buf.write("</firewall>");
- buf.write("</security>\n");
buf.close();
// Configure plugin