Merge of trunk up to rev 486021

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

16 files changed, 77 insertions, 41 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java b/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
new file mode 100644
index 0000000000..9b477c19e2
--- /dev/null
+++ b/java/client/src/test/java/org/apache/qpid/client/message/TestMessageHelper.java
@@ -0,0 +1,46 @@
+/*
+ *
+ * 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
+ * 
+ *   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.
+ *
+ */
+package org.apache.qpid.client.message;
+
+import javax.jms.JMSException;
+
+public class TestMessageHelper
+{
+    public static JMSTextMessage newJMSTextMessage() throws JMSException
+    {
+        return new JMSTextMessage();
+    }
+
+    public static JMSBytesMessage newJMSBytesMessage() throws JMSException
+    {
+        return new JMSBytesMessage();
+    }
+
+    public static JMSMapMessage newJMSMapMessage() throws JMSException
+    {
+        return new JMSMapMessage();
+    }
+
+    public static JMSStreamMessage newJMSStreamMessage()
+    {
+        return new JMSStreamMessage();
+    }
+}
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index bf0afa7eef..93c8a2333b 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -84,16 +84,6 @@
                             <value>file:///${basedir}/src/test/java/log4j.properties</value>
                         </property>
                     </systemProperties>
-                    <includes>
-                        <include>**/server/**/*Test.java</include>
-                        <include>**/test/unit/ack/DisconnectAndRedeliver.java</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/Abstract*Test*</exclude>
-                        <exclude>**/*PerfTest*</exclude>
-                        <exclude>**/*PerformanceTest*</exclude>
-                        <exclude>**/server/util/ConcurrentTest.java</exclude>
-                    </excludes>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java b/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
index ff0d58ad69..ff0d58ad69 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
diff --git a/java/systests/src/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java b/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
index e76c164f64..e76c164f64 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java b/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
index 11c0026455..11c0026455 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java b/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java
index 5b3857396d..5b3857396d 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java b/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
index 2c5712fd35..2c5712fd35 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
diff --git a/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java b/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java
index 1ae8d3205d..1ae8d3205d 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java
diff --git a/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java b/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
index 3e35e3c85b..3e35e3c85b 100644
--- a/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
+++ b/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index aa9c450bf6..b9aee2087e 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -42,9 +42,9 @@ import org.apache.log4j.Logger;
 
 import java.util.*;
 
-public class AbstractHeadersExchangeTest extends TestCase
+public class AbstractHeadersExchangeTestBase extends TestCase
 {
-    private static final Logger _log = Logger.getLogger(AbstractHeadersExchangeTest.class);
+    private static final Logger _log = Logger.getLogger(AbstractHeadersExchangeTestBase.class);
 
     private final HeadersExchange exchange = new HeadersExchange();
     protected final Set<TestQueue> queues = new HashSet<TestQueue>();
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 1c80e521ca..91520df3bf 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -24,7 +24,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.util.TestApplicationRegistry;
 
-public class HeadersExchangeTest extends AbstractHeadersExchangeTest
+public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
 {
     protected void setUp() throws Exception
     {
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
index a76db6a728..fe8960c872 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
@@ -36,7 +36,7 @@ public class ConcurrencyTest extends MessageTestHelper
 
     private final int numMessages = 1000;
 
-    private final List<TestSubscription> _subscribers = new ArrayList<TestSubscription>();
+    private final List<SubscriptionTestHelper> _subscribers = new ArrayList<SubscriptionTestHelper>();
     private final Set<Subscription> _active = new HashSet<Subscription>();
     private final List<AMQMessage> _messages = new ArrayList<AMQMessage>();
     private int next = 0;//index to next message to send
@@ -91,7 +91,7 @@ public class ConcurrencyTest extends MessageTestHelper
     {
         for(int i = 0; i < subscriptions; i++)
         {
-            _subscribers.add(new TestSubscription("Subscriber" + i, _received));
+            _subscribers.add(new SubscriptionTestHelper("Subscriber" + i, _received));
         }
     }
 
@@ -174,7 +174,7 @@ public class ConcurrencyTest extends MessageTestHelper
         return random.nextBoolean();
     }
 
-    private TestSubscription randomSubscriber()
+    private SubscriptionTestHelper randomSubscriber()
     {
         return _subscribers.get(random.nextInt(_subscribers.size()));
     }
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
index 9cfd9458d1..3631264e5a 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
@@ -48,8 +48,8 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
             _mgr.deliver("Me", messages[i]);
         }
 
-        TestSubscription s1 = new TestSubscription("1");
-        TestSubscription s2 = new TestSubscription("2");
+        SubscriptionTestHelper s1 = new SubscriptionTestHelper("1");
+        SubscriptionTestHelper s2 = new SubscriptionTestHelper("2");
         _subscriptions.addSubscriber(s1);
         _subscriptions.addSubscriber(s2);
 
@@ -88,7 +88,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
         }
         int batch = messages.length / 2;
 
-        TestSubscription s1 = new TestSubscription("1");
+        SubscriptionTestHelper s1 = new SubscriptionTestHelper("1");
         _subscriptions.addSubscriber(s1);
 
         for (int i = 0; i < batch; i++)
@@ -147,7 +147,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper
     {
         try
         {
-            TestSubscription s = new TestSubscription("A");
+            SubscriptionTestHelper s = new SubscriptionTestHelper("A");
             _subscriptions.addSubscriber(s);
             s.setSuspended(true);
             AMQMessage msg = message(true);
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
index f8db90850f..d3ec3c11d4 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
@@ -30,12 +30,12 @@ public class SubscriptionManagerTest extends TestCase
     {
         assertTrue(mgr.isEmpty());
         assertFalse(mgr.hasActiveSubscribers());
-        TestSubscription s1 = new TestSubscription("S1");
+        SubscriptionTestHelper s1 = new SubscriptionTestHelper("S1");
         mgr.addSubscriber(s1);
         assertFalse(mgr.isEmpty());
         assertTrue(mgr.hasActiveSubscribers());
 
-        TestSubscription s2 = new TestSubscription("S2");
+        SubscriptionTestHelper s2 = new SubscriptionTestHelper("S2");
         mgr.addSubscriber(s2);
 
         s2.setSuspended(true);
@@ -47,18 +47,18 @@ public class SubscriptionManagerTest extends TestCase
         s1.setSuspended(true);
         assertFalse(mgr.hasActiveSubscribers());
 
-        mgr.removeSubscriber(new TestSubscription("S1"));
+        mgr.removeSubscriber(new SubscriptionTestHelper("S1"));
         assertFalse(mgr.isEmpty());
-        mgr.removeSubscriber(new TestSubscription("S2"));
+        mgr.removeSubscriber(new SubscriptionTestHelper("S2"));
         assertTrue(mgr.isEmpty());
     }
 
     public void testRoundRobin()
     {
-        TestSubscription a = new TestSubscription("A");
-        TestSubscription b = new TestSubscription("B");
-        TestSubscription c = new TestSubscription("C");
-        TestSubscription d = new TestSubscription("D");
+        SubscriptionTestHelper a = new SubscriptionTestHelper("A");
+        SubscriptionTestHelper b = new SubscriptionTestHelper("B");
+        SubscriptionTestHelper c = new SubscriptionTestHelper("C");
+        SubscriptionTestHelper d = new SubscriptionTestHelper("D");
         mgr.addSubscriber(a);
         mgr.addSubscriber(b);
         mgr.addSubscriber(c);
@@ -84,7 +84,7 @@ public class SubscriptionManagerTest extends TestCase
         mgr.removeSubscriber(a);
         d.setSuspended(true);
         c.setSuspended(false);
-        Subscription e = new TestSubscription("D");
+        Subscription e = new SubscriptionTestHelper("D");
         mgr.addSubscriber(e);
 
         for (int i = 0; i < 3; i++)
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
index 4969b5589a..bcf54693d3 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
@@ -47,13 +47,13 @@ public class SubscriptionSetTest extends TestCase
         }
     }
 
-    final TestSubscription sub1 = new TestSubscription("1");
-    final TestSubscription sub2 = new TestSubscription("2");
-    final TestSubscription sub3 = new TestSubscription("3");
+    final SubscriptionTestHelper sub1 = new SubscriptionTestHelper("1");
+    final SubscriptionTestHelper sub2 = new SubscriptionTestHelper("2");
+    final SubscriptionTestHelper sub3 = new SubscriptionTestHelper("3");
 
-    final TestSubscription suspendedSub1 = new TestSubscription("sus1", true);
-    final TestSubscription suspendedSub2 = new TestSubscription("sus2", true);
-    final TestSubscription suspendedSub3 = new TestSubscription("sus3", true);
+    final SubscriptionTestHelper suspendedSub1 = new SubscriptionTestHelper("sus1", true);
+    final SubscriptionTestHelper suspendedSub2 = new SubscriptionTestHelper("sus2", true);
+    final SubscriptionTestHelper suspendedSub3 = new SubscriptionTestHelper("sus3", true);
 
     public void testNextMessage()
     {
@@ -114,7 +114,7 @@ public class SubscriptionSetTest extends TestCase
     public void testNextMessageOverScanning()
     {
         TestSubscriptionSet ss = new TestSubscriptionSet();
-        TestSubscription sub = new TestSubscription("test");
+        SubscriptionTestHelper sub = new SubscriptionTestHelper("test");
         ss.addSubscriber(suspendedSub1);
         ss.addSubscriber(sub);
         ss.addSubscriber(suspendedSub3);
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java b/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
index de6df4bc03..2773c810d2 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
@@ -23,24 +23,24 @@ package org.apache.qpid.server.queue;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TestSubscription implements Subscription
+public class SubscriptionTestHelper implements Subscription
 {
     private final List<AMQMessage> messages;
     private final Object key;
     private boolean isSuspended;
 
-    public TestSubscription(Object key)
+    public SubscriptionTestHelper(Object key)
     {
         this(key, new ArrayList<AMQMessage>());
     }
 
-    public TestSubscription(final Object key, final boolean isSuspended)
+    public SubscriptionTestHelper(final Object key, final boolean isSuspended)
     {
         this(key);
         setSuspended(isSuspended);
     }
 
-    TestSubscription(Object key, List<AMQMessage> messages)
+    SubscriptionTestHelper(Object key, List<AMQMessage> messages)
     {
         this.key = key;
         this.messages = messages;
@@ -77,7 +77,7 @@ public class TestSubscription implements Subscription
 
     public boolean equals(Object o)
     {
-        return o instanceof TestSubscription && ((TestSubscription) o).key.equals(key);
+        return o instanceof SubscriptionTestHelper && ((SubscriptionTestHelper) o).key.equals(key);
     }
 
     public String toString()