Fixed test state carrying over to mandatory message test from immediate. Also added in-vm clean up to other tests.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553432 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 45 insertions, 33 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
index 20de0d5df0..370c2b43a7 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
@@ -1,30 +1,34 @@
 /*
  *
- * Copyright (c) 2006 The Apache Software Foundation
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  *
  */
 package org.apache.qpid.server;
 
 import junit.framework.TestCase;
+
+import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.server.exchange.ExchangeRegistry;
 import org.apache.qpid.server.management.ManagedBroker;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.framing.AMQShortString;
 
 public class AMQBrokerManagerMBeanTest extends TestCase
 {
@@ -33,9 +37,9 @@ public class AMQBrokerManagerMBeanTest extends TestCase
 
     public void testExchangeOperations() throws Exception
     {
-        String exchange1 = "testExchange1_" +  System.currentTimeMillis();
-        String exchange2 = "testExchange2_" +  System.currentTimeMillis();
-        String exchange3 = "testExchange3_" +  System.currentTimeMillis();
+        String exchange1 = "testExchange1_" + System.currentTimeMillis();
+        String exchange2 = "testExchange2_" + System.currentTimeMillis();
+        String exchange3 = "testExchange3_" + System.currentTimeMillis();
 
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null);
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null);
@@ -43,10 +47,10 @@ public class AMQBrokerManagerMBeanTest extends TestCase
 
         VirtualHost vHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
 
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean)vHost.getManagedObject());
-        mbean.createNewExchange(exchange1,"direct",false);
-        mbean.createNewExchange(exchange2,"topic",false);
-        mbean.createNewExchange(exchange3,"headers",false);
+        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) vHost.getManagedObject());
+        mbean.createNewExchange(exchange1, "direct", false);
+        mbean.createNewExchange(exchange2, "topic", false);
+        mbean.createNewExchange(exchange3, "headers", false);
 
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) != null);
         assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) != null);
@@ -66,10 +70,10 @@ public class AMQBrokerManagerMBeanTest extends TestCase
         String queueName = "testQueue_" + System.currentTimeMillis();
         VirtualHost vHost = ApplicationRegistry.getInstance().getVirtualHostRegistry().getVirtualHost("test");
 
-        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean)vHost.getManagedObject());
+        ManagedBroker mbean = new AMQBrokerManagerMBean((VirtualHost.VirtualHostMBean) vHost.getManagedObject());
 
         assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null);
-                
+
         mbean.createNewQueue(queueName, "test", false);
         assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) != null);
 
@@ -82,7 +86,7 @@ public class AMQBrokerManagerMBeanTest extends TestCase
     {
         super.setUp();
         IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
-        _queueRegistry    = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry();
+        _queueRegistry = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getQueueRegistry();
         _exchangeRegistry = appRegistry.getVirtualHostRegistry().getVirtualHost("test").getExchangeRegistry();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
index 048fcfb0b3..dbe932d015 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/ImmediateMessageTest.java
@@ -286,6 +286,7 @@ public class ImmediateMessageTest extends TestCase
 

         /** All these tests should have the immediate flag on. */

         testProps.setProperty(IMMEDIATE_PROPNAME, true);

+        testProps.setProperty(MANDATORY_PROPNAME, false);

 

         /** Bind the receivers consumer by default. */

         testProps.setProperty(RECEIVER_CONSUMER_BIND_PROPNAME, true);

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
index 09a32aa3eb..0bc31befe8 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/MandatoryMessageTest.java
@@ -284,6 +284,7 @@ public class MandatoryMessageTest extends TestCase
         testProps = TestContextProperties.getInstance(MessagingTestConfigProperties.defaults);

 

         /** All these tests should have the mandatory flag on. */

+        testProps.setProperty(IMMEDIATE_PROPNAME, false);

         testProps.setProperty(MANDATORY_PROPNAME, true);

 

         /** Bind the receivers consumer by default. */

diff --git a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
index 540c91ddaf..9629f87d46 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
@@ -1,4 +1,5 @@
 /*
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,29 +21,32 @@
 package org.apache.qpid.test;
 
 import junit.extensions.TestSetup;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
+import org.apache.qpid.server.registry.ApplicationRegistry;
 
-import javax.naming.Context;
-import javax.naming.spi.InitialContextFactory;
-import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
-import javax.jms.Session;
 import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
 import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.naming.Context;
+import javax.naming.spi.InitialContextFactory;
+
+import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 public class VMTestCase extends TestCase
 {
-    protected long RECEIVE_TIMEOUT = 1000l;    // 1 sec
-    protected long CLOSE_TIMEOUT = 10000l;     // 10 secs
+    protected long RECEIVE_TIMEOUT = 1000L; // 1 sec
+    protected long CLOSE_TIMEOUT = 10000L; // 10 secs
 
     protected Context _context;
     protected String _clientID;
@@ -84,8 +88,8 @@ public class VMTestCase extends TestCase
             _brokerlist = "vm://:1";
         }
 
-        env.put("connectionfactory.connection", "amqp://guest:guest@" +
-                                                _clientID + _virtualhost + "?brokerlist='" + _brokerlist + "'");
+        env.put("connectionfactory.connection", "amqp://guest:guest@" + _clientID + _virtualhost + "?brokerlist='"
+            + _brokerlist + "'");
 
         for (Map.Entry<String, String> c : _connections.entrySet())
         {
@@ -112,6 +116,8 @@ public class VMTestCase extends TestCase
     protected void tearDown() throws Exception
     {
         TransportConnection.killVMBroker(1);
+        ApplicationRegistry.remove(1);
+
         super.tearDown();
     }