1 files changed, 36 insertions, 20 deletions

diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
index 8f743d8856..ba504d3064 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
@@ -20,13 +20,10 @@
 package org.apache.qpid.server.configuration;
 
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
+import junit.framework.TestCase;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.commons.configuration.HierarchicalConfiguration.Node;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.queue.AMQPriorityQueue;
@@ -34,29 +31,22 @@ import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
 
-import junit.framework.TestCase;
-
 public class VirtualHostConfigurationTest extends TestCase
 {
 
-    private File configFile;
     private VirtualHostConfiguration vhostConfig;
     private XMLConfiguration  configXml;
 
     @Override
     protected void setUp() throws Exception
-    {
-        // Create temporary configuration file
-        configFile = File.createTempFile(this.getName()+"config", ".xml");
-        configFile.deleteOnExit();
-        
+    {   
         // Fill config file with stuff
         configXml = new XMLConfiguration();
         configXml.setRootElementName("virtualhosts");
         configXml.addProperty("virtualhost(-1).name", "test");
     }
     
-    public void testQueuePriority() throws ConfigurationException, AMQException
+    public void testQueuePriority() throws Exception
     {
         // Set up queue with 5 priorities
         configXml.addProperty("virtualhost.test.queues(-1).queue(-1).name(-1)", 
@@ -81,14 +71,8 @@ public class VirtualHostConfigurationTest extends TestCase
                               "amq.direct");
         configXml.addProperty("virtualhost.test.queues.queue.ntest.priority", 
                               "false");
-        configXml.save(configFile);
-        
-        // Setup virtual host configuration
-        vhostConfig = new VirtualHostConfiguration(configFile.getAbsolutePath());
         
-        // Do bindings and get resulting vhost
-        vhostConfig.performBindings();
-        VirtualHost vhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
+        VirtualHost vhost = new VirtualHost(new VirtualHostConfiguration("test", configXml.subset("virtualhost.test")));
         
         // Check that atest was a priority queue with 5 priorities
         AMQQueue atest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
@@ -105,4 +89,36 @@ public class VirtualHostConfigurationTest extends TestCase
         assertFalse(ntest instanceof AMQPriorityQueue);
     }
     
+    public void testQueueAlerts() throws Exception
+    {
+        // Set up queue with 5 priorities
+        configXml.addProperty("virtualhost.test.queues.exchange", "amq.topic");
+        configXml.addProperty("virtualhost.test.queues.maximumQueueDepth", "1");
+        configXml.addProperty("virtualhost.test.queues.maximumMessageSize", "2");
+        configXml.addProperty("virtualhost.test.queues.maximumMessageAge", "3");
+        
+        configXml.addProperty("virtualhost.test.queues(-1).queue(1).name(1)", "atest");
+        configXml.addProperty("virtualhost.test.queues.queue.atest(-1).exchange", "amq.direct");
+        configXml.addProperty("virtualhost.test.queues.queue.atest(-1).maximumQueueDepth", "4");
+        configXml.addProperty("virtualhost.test.queues.queue.atest(-1).maximumMessageSize", "5");
+        configXml.addProperty("virtualhost.test.queues.queue.atest(-1).maximumMessageAge", "6");
+
+        configXml.addProperty("virtualhost.test.queues(-1).queue(-1).name(-1)", "btest");
+        
+        VirtualHost vhost = new VirtualHost(new VirtualHostConfiguration("test", configXml.subset("virtualhost.test")));
+        
+        // Check specifically configured values
+        AMQQueue aTest = vhost.getQueueRegistry().getQueue(new AMQShortString("atest"));
+        assertEquals(4, aTest.getMaximumQueueDepth());
+        assertEquals(5, aTest.getMaximumMessageSize());
+        assertEquals(6, aTest.getMaximumMessageAge());
+        
+        // Check default values        
+        AMQQueue bTest = vhost.getQueueRegistry().getQueue(new AMQShortString("btest"));
+        assertEquals(1, bTest.getMaximumQueueDepth());
+        assertEquals(2, bTest.getMaximumMessageSize());
+        assertEquals(3, bTest.getMaximumMessageAge());
+        
+    }
+    
 }