Author: vinoski
Date: Mon Dec 11 20:57:43 2006
New Revision: 486021
URL: http://svn.apache.org/viewvc?view=rev&rev=486021
Log:
systests test reorg
* move unused tests to src/old_test
* modify pom.xml to remove surefire inclusions and exclusions
Added:
incubator/qpid/trunk/qpid/java/systests/src/old_test/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/exchange/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/protocol/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/queue/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/queue/QueuePerfTest.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/queue/SendPerfTest.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/util/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/server/util/ConcurrentTest.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/test/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/test/unit/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/
incubator/qpid/trunk/qpid/java/systests/src/old_test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
- copied unchanged from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
- copied, changed from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
- copied, changed from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
Removed:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/TestProtocolInitiation.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/QueuePerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/util/ConcurrentTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java
Modified:
incubator/qpid/trunk/qpid/java/systests/pom.xml
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
Modified: incubator/qpid/trunk/qpid/java/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/pom.xml?view=diff&rev=486021&r1=486020&r2=486021
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/systests/pom.xml Mon Dec 11 20:57:43 2006
@@ -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>
Copied:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
(from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?view=diff&rev=486021&p1=incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java&r1=486006&p2=incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
Mon Dec 11 20:57:43 2006
@@ -40,7 +40,7 @@
import java.util.List;
import java.util.Set;
-public class AbstractHeadersExchangeTest extends TestCase
+public class AbstractHeadersExchangeTestBase extends TestCase
{
private final HeadersExchange exchange = new HeadersExchange();
protected final Set<TestQueue> queues = new HashSet<TestQueue>();
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?view=diff&rev=486021&r1=486020&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Mon Dec 11 20:57:43 2006
@@ -24,7 +24,7 @@
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
{
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java?view=diff&rev=486021&r1=486020&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java
Mon Dec 11 20:57:43 2006
@@ -36,7 +36,7 @@
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 @@
{
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 @@
return random.nextBoolean();
}
- private TestSubscription randomSubscriber()
+ private SubscriptionTestHelper randomSubscriber()
{
return _subscribers.get(random.nextInt(_subscribers.size()));
}
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java?view=diff&rev=486021&r1=486020&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java
Mon Dec 11 20:57:43 2006
@@ -48,8 +48,8 @@
_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 @@
}
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 @@
{
try
{
- TestSubscription s = new TestSubscription("A");
+ SubscriptionTestHelper s = new SubscriptionTestHelper("A");
_subscriptions.addSubscriber(s);
s.setSuspended(true);
AMQMessage msg = message(true);
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java?view=diff&rev=486021&r1=486020&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionManagerTest.java
Mon Dec 11 20:57:43 2006
@@ -30,12 +30,12 @@
{
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 @@
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 @@
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++)
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java?view=diff&rev=486021&r1=486020&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionSetTest.java
Mon Dec 11 20:57:43 2006
@@ -47,13 +47,13 @@
}
}
- final TestSubscription sub1 = new TestSubscription("1");
- final TestSubscription sub2 = new TestSubscription("2");
- final TestSubscription sub3 = new TestSubscription("3");
-
- final TestSubscription suspendedSub1 = new TestSubscription("sus1", true);
- final TestSubscription suspendedSub2 = new TestSubscription("sus2", true);
- final TestSubscription suspendedSub3 = new TestSubscription("sus3", true);
+ final SubscriptionTestHelper sub1 = new SubscriptionTestHelper("1");
+ final SubscriptionTestHelper sub2 = new SubscriptionTestHelper("2");
+ final SubscriptionTestHelper sub3 = new SubscriptionTestHelper("3");
+
+ 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 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);
Copied:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
(from r486006,
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java?view=diff&rev=486021&p1=incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java&r1=486006&p2=incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java&r2=486021
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
Mon Dec 11 20:57:43 2006
@@ -23,24 +23,24 @@
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 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()
