diff options
author | Stephen Vinoski <vinoski@apache.org> | 2006-11-12 06:32:55 +0000 |
---|---|---|
committer | Stephen Vinoski <vinoski@apache.org> | 2006-11-12 06:32:55 +0000 |
commit | fc5ad32cc8f2d4d793c0cf79382755e9fca2357c (patch) | |
tree | fbb00a5ad4c96678d094710d5b7a8b1455bb0e07 /java | |
parent | e3ec7133ff4ce3a54df70d5314188d23be4112a1 (diff) | |
download | qpid-python-fc5ad32cc8f2d4d793c0cf79382755e9fca2357c.tar.gz |
* added top-level systests directory for non-unit tests
* moved some tests into systests to eliminate dependencies between
test subdirectories (required for maven)
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473889 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r-- | java/broker/test/src/org/apache/qpid/server/UnitTests.java | 4 | ||||
-rw-r--r-- | java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java | 2 | ||||
-rw-r--r-- | java/build.xml | 2 | ||||
-rw-r--r-- | java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java | 2 | ||||
-rw-r--r-- | java/systests/build-module.xml | 62 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/UnitTests.java | 42 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/ack/TxAckTest.java (renamed from java/broker/test/src/org/apache/qpid/server/ack/TxAckTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/ack/UnitTests.java (renamed from java/broker/test/src/org/apache/qpid/server/ack/UnitTests.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java (renamed from java/broker/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java (renamed from java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java (renamed from java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/exchange/UnitTests.java | 35 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/protocol/MockIoSession.java (renamed from java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java (renamed from java/broker/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/protocol/UnitTests.java (renamed from java/broker/test/src/org/apache/qpid/server/protocol/UnitTests.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/AckTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/AckTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/ConcurrencyTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/DeliveryManagerTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/MessageTestHelper.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/MockProtocolSession.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/MockProtocolSession.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/QueuePerfTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/QueuePerfTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/SendPerfTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/SubscriptionSetTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/TestSubscription.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/TestSubscription.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/queue/UnitTests.java (renamed from java/broker/test/src/org/apache/qpid/server/queue/UnitTests.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/store/SkeletonMessageStore.java (renamed from java/broker/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/store/TestReferenceCounting.java (renamed from java/broker/test/src/org/apache/qpid/server/store/TestReferenceCounting.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java (renamed from java/broker/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/store/UnitTests.java (renamed from java/broker/test/src/org/apache/qpid/server/store/UnitTests.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/txn/TxnBufferTest.java (renamed from java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/txn/UnitTests.java (renamed from java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/util/AveragedRun.java (renamed from java/broker/test/src/org/apache/qpid/server/util/AveragedRun.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/util/ConcurrentTest.java (renamed from java/broker/test/src/org/apache/qpid/server/util/ConcurrentTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/util/RunStats.java (renamed from java/broker/test/src/org/apache/qpid/server/util/RunStats.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/util/TestApplicationRegistry.java (renamed from java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/server/util/TimedRun.java (renamed from java/broker/test/src/org/apache/qpid/server/util/TimedRun.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java (renamed from java/client/test/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java) | 0 | ||||
-rw-r--r-- | java/systests/src/org/apache/qpid/test/unit/ack/UnitTests.java | 35 |
42 files changed, 177 insertions, 7 deletions
diff --git a/java/broker/test/src/org/apache/qpid/server/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/UnitTests.java index 85eeac939c..fcae268288 100644 --- a/java/broker/test/src/org/apache/qpid/server/UnitTests.java +++ b/java/broker/test/src/org/apache/qpid/server/UnitTests.java @@ -28,10 +28,6 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ org.apache.qpid.server.configuration.UnitTests.class, org.apache.qpid.server.exchange.UnitTests.class, - org.apache.qpid.server.protocol.UnitTests.class, - org.apache.qpid.server.queue.UnitTests.class, - org.apache.qpid.server.store.UnitTests.class, - org.apache.qpid.server.txn.UnitTests.class, org.apache.qpid.server.util.UnitTests.class }) public class UnitTests diff --git a/java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java b/java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java index 349bca31c2..ce3812be7f 100644 --- a/java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java +++ b/java/broker/test/src/org/apache/qpid/server/exchange/UnitTests.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({HeadersBindingTest.class, HeadersExchangeTest.class}) +@Suite.SuiteClasses({HeadersBindingTest.class}) public class UnitTests { public static junit.framework.Test suite() diff --git a/java/build.xml b/java/build.xml index dea7a21399..31e56572e6 100644 --- a/java/build.xml +++ b/java/build.xml @@ -26,7 +26,7 @@ <property name="modules.extra" value=""/> <property name="modules.client" value="common,client"/> <property name="modules" - value="${modules.client},broker,broker/test,client/test,management/core,management/cli,cluster,${modules.extra}"/> + value="${modules.client},broker,broker/test,client/test,management/core,management/cli,cluster,systests,${modules.extra}"/> <property name="release.fullversion" value="${build.release.version}-${build.release.name}-${build.release.tag}"/> diff --git a/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java b/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java index 97e0e44ebe..a0eec941d5 100644 --- a/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java +++ b/java/client/test/src/org/apache/qpid/test/unit/ack/UnitTests.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({DisconnectAndRedeliverTest.class, RecoverTest.class}) +@Suite.SuiteClasses({RecoverTest.class}) public class UnitTests { public static junit.framework.Test suite() diff --git a/java/systests/build-module.xml b/java/systests/build-module.xml new file mode 100644 index 0000000000..9292bcd083 --- /dev/null +++ b/java/systests/build-module.xml @@ -0,0 +1,62 @@ +<!-- + - + - 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. + - + --> +<project name="System Tests" default="build"> + <property name="module.depends" value="client broker common"/> + <property name="module.dist" value="false"/> + + <import file="../module.xml"/> + + <target name="test" depends="build"> + <junit fork="yes" showoutput="true" haltonfailure="yes"> + <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/> + <formatter type="plain"/> + <classpath refid="module.class.path"/> + <batchtest fork="yes" todir="${module.test.reports}"> + <fileset dir="${module.src}"> + <include name="**/server/UnitTests.java"/> + <include name="**/test/unit/ack/UnitTests.java"/> + </fileset> + </batchtest> + </junit> + </target> + + <target name="testreport" depends="build"> + <junit fork="yes" printsummary="yes" haltonfailure="no" timeout="90000"> + <sysproperty key="amqj.noAutoCreateVMBroker" value="true"/> + <formatter type="xml" /> + <classpath refid="module.class.path" /> + <batchtest fork="yes" todir="${module.test.reports}"> + <fileset dir="${module.src}"> + <include name="**/server/UnitTests.java"/> + <include name="**/test/unit/ack/UnitTests.java"/> + </fileset> + </batchtest> + </junit> + + <junitreport todir="${module.test.reports}"> + <fileset dir="${module.test.reports}"> + <include name="TEST-*.xml"/> + </fileset> + <report todir="${module.test.reports}"/> + </junitreport> + </target> + +</project> diff --git a/java/systests/src/org/apache/qpid/server/UnitTests.java b/java/systests/src/org/apache/qpid/server/UnitTests.java new file mode 100644 index 0000000000..1f4af59ce7 --- /dev/null +++ b/java/systests/src/org/apache/qpid/server/UnitTests.java @@ -0,0 +1,42 @@ +/* + * + * 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.server; + +import junit.framework.JUnit4TestAdapter; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ + org.apache.qpid.server.ack.UnitTests.class, + org.apache.qpid.server.exchange.UnitTests.class, + org.apache.qpid.server.protocol.UnitTests.class, + org.apache.qpid.server.queue.UnitTests.class, + org.apache.qpid.server.store.UnitTests.class, + org.apache.qpid.server.txn.UnitTests.class + }) +public class UnitTests +{ + public static junit.framework.Test suite() + { + return new JUnit4TestAdapter(UnitTests.class); + } +} diff --git a/java/broker/test/src/org/apache/qpid/server/ack/TxAckTest.java b/java/systests/src/org/apache/qpid/server/ack/TxAckTest.java index fe2c189c39..fe2c189c39 100644 --- a/java/broker/test/src/org/apache/qpid/server/ack/TxAckTest.java +++ b/java/systests/src/org/apache/qpid/server/ack/TxAckTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/ack/UnitTests.java b/java/systests/src/org/apache/qpid/server/ack/UnitTests.java index 45ffe1fd6c..45ffe1fd6c 100644 --- a/java/broker/test/src/org/apache/qpid/server/ack/UnitTests.java +++ b/java/systests/src/org/apache/qpid/server/ack/UnitTests.java diff --git a/java/broker/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java b/java/systests/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java index 1bb1d12e1c..1bb1d12e1c 100644 --- a/java/broker/test/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java +++ b/java/systests/src/org/apache/qpid/server/exchange/AbstractHeadersExchangeTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java b/java/systests/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java index ff0d58ad69..ff0d58ad69 100644 --- a/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java +++ b/java/systests/src/org/apache/qpid/server/exchange/HeadersExchangePerformanceTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/systests/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java index 7d80a6dce7..7d80a6dce7 100644 --- a/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java +++ b/java/systests/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java diff --git a/java/systests/src/org/apache/qpid/server/exchange/UnitTests.java b/java/systests/src/org/apache/qpid/server/exchange/UnitTests.java new file mode 100644 index 0000000000..9ad3b65008 --- /dev/null +++ b/java/systests/src/org/apache/qpid/server/exchange/UnitTests.java @@ -0,0 +1,35 @@ +/* + * + * 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.server.exchange; + +import junit.framework.JUnit4TestAdapter; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({HeadersExchangeTest.class}) +public class UnitTests +{ + public static junit.framework.Test suite() + { + return new JUnit4TestAdapter(UnitTests.class); + } +} diff --git a/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java b/java/systests/src/org/apache/qpid/server/protocol/MockIoSession.java index 81dea32a76..81dea32a76 100644 --- a/java/broker/test/src/org/apache/qpid/server/protocol/MockIoSession.java +++ b/java/systests/src/org/apache/qpid/server/protocol/MockIoSession.java diff --git a/java/broker/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java b/java/systests/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java index 847c3cc51b..847c3cc51b 100644 --- a/java/broker/test/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java +++ b/java/systests/src/org/apache/qpid/server/protocol/TestProtocolInitiation.java diff --git a/java/broker/test/src/org/apache/qpid/server/protocol/UnitTests.java b/java/systests/src/org/apache/qpid/server/protocol/UnitTests.java index 53038a4058..53038a4058 100644 --- a/java/broker/test/src/org/apache/qpid/server/protocol/UnitTests.java +++ b/java/systests/src/org/apache/qpid/server/protocol/UnitTests.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java b/java/systests/src/org/apache/qpid/server/queue/AckTest.java index fe04bd43e1..fe04bd43e1 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/AckTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java b/java/systests/src/org/apache/qpid/server/queue/ConcurrencyTest.java index 60d86a14a7..60d86a14a7 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/ConcurrencyTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/ConcurrencyTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java b/java/systests/src/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java index 9d841d86f5..9d841d86f5 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/systests/src/org/apache/qpid/server/queue/DeliveryManagerTest.java index a6739223b0..a6739223b0 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/DeliveryManagerTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java b/java/systests/src/org/apache/qpid/server/queue/MessageTestHelper.java index be40b3c681..be40b3c681 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java +++ b/java/systests/src/org/apache/qpid/server/queue/MessageTestHelper.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/org/apache/qpid/server/queue/MockProtocolSession.java index bb8fd5bc19..bb8fd5bc19 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/MockProtocolSession.java +++ b/java/systests/src/org/apache/qpid/server/queue/MockProtocolSession.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java b/java/systests/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java index 11c0026455..11c0026455 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/QueueConcurrentPerfTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/QueuePerfTest.java b/java/systests/src/org/apache/qpid/server/queue/QueuePerfTest.java index 5b3857396d..5b3857396d 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/QueuePerfTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/QueuePerfTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java b/java/systests/src/org/apache/qpid/server/queue/SendPerfTest.java index 6490b9f270..6490b9f270 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/SendPerfTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java b/java/systests/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java index fe0b686c1a..fe0b686c1a 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/SubscriptionManagerTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java b/java/systests/src/org/apache/qpid/server/queue/SubscriptionSetTest.java index e6b0f7e885..e6b0f7e885 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/SubscriptionSetTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/SubscriptionSetTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java b/java/systests/src/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java index faa6bdcbe7..faa6bdcbe7 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java +++ b/java/systests/src/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/TestSubscription.java b/java/systests/src/org/apache/qpid/server/queue/TestSubscription.java index de6df4bc03..de6df4bc03 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/TestSubscription.java +++ b/java/systests/src/org/apache/qpid/server/queue/TestSubscription.java diff --git a/java/broker/test/src/org/apache/qpid/server/queue/UnitTests.java b/java/systests/src/org/apache/qpid/server/queue/UnitTests.java index fbdcaf7467..fbdcaf7467 100644 --- a/java/broker/test/src/org/apache/qpid/server/queue/UnitTests.java +++ b/java/systests/src/org/apache/qpid/server/queue/UnitTests.java diff --git a/java/broker/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java b/java/systests/src/org/apache/qpid/server/store/SkeletonMessageStore.java index bc0a8a7d64..bc0a8a7d64 100644 --- a/java/broker/test/src/org/apache/qpid/server/store/SkeletonMessageStore.java +++ b/java/systests/src/org/apache/qpid/server/store/SkeletonMessageStore.java diff --git a/java/broker/test/src/org/apache/qpid/server/store/TestReferenceCounting.java b/java/systests/src/org/apache/qpid/server/store/TestReferenceCounting.java index 7431e6e4cc..7431e6e4cc 100644 --- a/java/broker/test/src/org/apache/qpid/server/store/TestReferenceCounting.java +++ b/java/systests/src/org/apache/qpid/server/store/TestReferenceCounting.java diff --git a/java/broker/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/java/systests/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java index be7687a22c..be7687a22c 100644 --- a/java/broker/test/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java +++ b/java/systests/src/org/apache/qpid/server/store/TestableMemoryMessageStore.java diff --git a/java/broker/test/src/org/apache/qpid/server/store/UnitTests.java b/java/systests/src/org/apache/qpid/server/store/UnitTests.java index 8e11f823a9..8e11f823a9 100644 --- a/java/broker/test/src/org/apache/qpid/server/store/UnitTests.java +++ b/java/systests/src/org/apache/qpid/server/store/UnitTests.java diff --git a/java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java b/java/systests/src/org/apache/qpid/server/txn/TxnBufferTest.java index f1b14b69b8..f1b14b69b8 100644 --- a/java/broker/test/src/org/apache/qpid/server/txn/TxnBufferTest.java +++ b/java/systests/src/org/apache/qpid/server/txn/TxnBufferTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java b/java/systests/src/org/apache/qpid/server/txn/UnitTests.java index 975e8eea72..975e8eea72 100644 --- a/java/broker/test/src/org/apache/qpid/server/txn/UnitTests.java +++ b/java/systests/src/org/apache/qpid/server/txn/UnitTests.java diff --git a/java/broker/test/src/org/apache/qpid/server/util/AveragedRun.java b/java/systests/src/org/apache/qpid/server/util/AveragedRun.java index 1d17985ab5..1d17985ab5 100644 --- a/java/broker/test/src/org/apache/qpid/server/util/AveragedRun.java +++ b/java/systests/src/org/apache/qpid/server/util/AveragedRun.java diff --git a/java/broker/test/src/org/apache/qpid/server/util/ConcurrentTest.java b/java/systests/src/org/apache/qpid/server/util/ConcurrentTest.java index 1ae8d3205d..1ae8d3205d 100644 --- a/java/broker/test/src/org/apache/qpid/server/util/ConcurrentTest.java +++ b/java/systests/src/org/apache/qpid/server/util/ConcurrentTest.java diff --git a/java/broker/test/src/org/apache/qpid/server/util/RunStats.java b/java/systests/src/org/apache/qpid/server/util/RunStats.java index ec67fc68b3..ec67fc68b3 100644 --- a/java/broker/test/src/org/apache/qpid/server/util/RunStats.java +++ b/java/systests/src/org/apache/qpid/server/util/RunStats.java diff --git a/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java b/java/systests/src/org/apache/qpid/server/util/TestApplicationRegistry.java index f801daf27c..f801daf27c 100644 --- a/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java +++ b/java/systests/src/org/apache/qpid/server/util/TestApplicationRegistry.java diff --git a/java/broker/test/src/org/apache/qpid/server/util/TimedRun.java b/java/systests/src/org/apache/qpid/server/util/TimedRun.java index 1291380311..1291380311 100644 --- a/java/broker/test/src/org/apache/qpid/server/util/TimedRun.java +++ b/java/systests/src/org/apache/qpid/server/util/TimedRun.java diff --git a/java/client/test/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java b/java/systests/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java index 53d83fb6a3..53d83fb6a3 100644 --- a/java/client/test/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java +++ b/java/systests/src/org/apache/qpid/test/unit/ack/DisconnectAndRedeliverTest.java diff --git a/java/systests/src/org/apache/qpid/test/unit/ack/UnitTests.java b/java/systests/src/org/apache/qpid/test/unit/ack/UnitTests.java new file mode 100644 index 0000000000..498667e2bc --- /dev/null +++ b/java/systests/src/org/apache/qpid/test/unit/ack/UnitTests.java @@ -0,0 +1,35 @@ +/* + * + * 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.test.unit.ack; + +import junit.framework.JUnit4TestAdapter; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({DisconnectAndRedeliverTest.class}) +public class UnitTests +{ + public static junit.framework.Test suite() + { + return new JUnit4TestAdapter(UnitTests.class); + } +} |