You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/03/16 20:43:57 UTC
svn commit: r1578145 - in /qpid/trunk/qpid/java: ./ bdbstore/systests/
perftests/ perftests/src/test/java/org/apache/qpid/disttest/
perftests/src/test/java/org/apache/qpid/disttest/controller/
perftests/src/test/java/org/apache/qpid/systest/ qpid-perft...
Author: robbie
Date: Sun Mar 16 19:43:56 2014
New Revision: 1578145
URL: http://svn.apache.org/r1578145
Log:
QPID-5048: split out systests from perftests and add rat plugin config
Patch supplied by Andrew MacBean <an...@gmail.com>
Added:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java
qpid/trunk/qpid/java/qpid-perftests-systests/
qpid/trunk/qpid/java/qpid-perftests-systests/build.xml
qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/pom.xml
qpid/trunk/qpid/java/qpid-perftests-systests/src/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json
qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties
- copied, changed from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties
Removed:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/
Modified:
qpid/trunk/qpid/java/bdbstore/systests/pom.xml
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/perftests/pom.xml
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
qpid/trunk/qpid/java/pom.xml
qpid/trunk/qpid/java/qpid-systests-parent/pom.xml
qpid/trunk/qpid/java/systests/pom.xml
Modified: qpid/trunk/qpid/java/bdbstore/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/pom.xml?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/systests/pom.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/systests/pom.xml Sun Mar 16 19:43:56 2014
@@ -67,8 +67,4 @@
</dependency>
</dependencies>
- <build>
- <testSourceDirectory>src/main/java</testSourceDirectory>
- </build>
-
</project>
Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Sun Mar 16 19:43:56 2014
@@ -36,7 +36,7 @@
<property name="modules.core" value="qpid-test-utils common management/common amqp-1-0-common broker-core broker client amqp-1-0-client amqp-1-0-client-jms amqp-1-0-client-websocket tools"/>
<property name="modules.examples" value="client/example management/example amqp-1-0-client/example amqp-1-0-client-jms/example"/>
- <property name="modules.tests" value="systests perftests"/>
+ <property name="modules.tests" value="systests perftests qpid-perftests-systests"/>
<property name="modules.plugin" value="${broker-plugins} ${client-plugins}"/>
<property name="modules.jca" value="jca"/>
<property name="modules" value="${modules.core} ${modules.examples}
Modified: qpid/trunk/qpid/java/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/pom.xml?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ qpid/trunk/qpid/java/perftests/pom.xml Sun Mar 16 19:43:56 2014
@@ -20,19 +20,14 @@
<parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-systests-parent</artifactId>
+ <artifactId>qpid-java-build</artifactId>
<version>0.28-SNAPSHOT</version>
- <relativePath>../qpid-systests-parent/pom.xml</relativePath>
</parent>
<artifactId>qpid-perftests</artifactId>
<name>Qpid Performance Tests</name>
<description>Performance testing configuration, code and tests</description>
- <properties>
- <test.systest.resource.directory>${basedir}/../systests</test.systest.resource.directory>
- </properties>
-
<dependencies>
<!-- client deps -->
<dependency>
@@ -77,13 +72,6 @@
<!-- test deps -->
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-systests</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.qpid</groupId>
<artifactId>qpid-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -91,6 +79,19 @@
</dependencies>
<build>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java/</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
<testResources>
<testResource>
<directory>src/test/java</directory>
Copied: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java?p2=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java (original)
+++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/PerfTestConstants.java Sun Mar 16 19:43:56 2014
@@ -17,9 +17,9 @@
* under the License.
*
*/
-package org.apache.qpid.systest.disttest;
+package org.apache.qpid.disttest;
-public abstract class SystemTestConstants
+public abstract class PerfTestConstants
{
public static final long REGISTRATION_TIMEOUT = 20000;
public static final long COMMAND_RESPONSE_TIMEOUT = 30000;
Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java (original)
+++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/ControllerTest.java Sun Mar 16 19:43:56 2014
@@ -19,8 +19,8 @@
*/
package org.apache.qpid.disttest.controller;
-import static org.apache.qpid.systest.disttest.SystemTestConstants.COMMAND_RESPONSE_TIMEOUT;
-import static org.apache.qpid.systest.disttest.SystemTestConstants.REGISTRATION_TIMEOUT;
+import static org.apache.qpid.disttest.PerfTestConstants.COMMAND_RESPONSE_TIMEOUT;
+import static org.apache.qpid.disttest.PerfTestConstants.REGISTRATION_TIMEOUT;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
Modified: qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/pom.xml?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/pom.xml (original)
+++ qpid/trunk/qpid/java/pom.xml Sun Mar 16 19:43:56 2014
@@ -108,6 +108,7 @@
<module>qpid-test-utils</module>
<module>systests</module>
<module>perftests</module>
+ <module>qpid-perftests-systests</module>
<module>perftests/visualisation-jfc</module>
<module>bdbstore</module>
@@ -330,6 +331,15 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>build/**</exclude>
+ <exclude>resources/**</exclude>
+ <exclude>test-profiles/**</exclude>
+ <exclude>release-docs/**</exclude>
+ <exclude>lib/**</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
@@ -387,6 +397,15 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${apache-rat-plugin-version}</version>
+ <configuration>
+ <excludes>
+ <exclude>build/**</exclude>
+ <exclude>resources/**</exclude>
+ <exclude>test-profiles/**</exclude>
+ <exclude>release-docs/**</exclude>
+ <exclude>lib/**</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
Added: qpid/trunk/qpid/java/qpid-perftests-systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/build.xml?rev=1578145&view=auto
==============================================================================
--- qpid/trunk/qpid/java/qpid-perftests-systests/build.xml (added)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/build.xml Sun Mar 16 19:43:56 2014
@@ -0,0 +1,67 @@
+<!--
+ -
+ - 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="Performance Tests System Tests" default="build">
+ <condition property="perftests.optional.test.depends" value="bdbstore" else="">
+ <or>
+ <and>
+ <contains string="${modules.opt}" substring="bdbstore"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ <and>
+ <istrue value="${optional}"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ </or>
+ </condition>
+
+ <property name="module.depends" value="client common perftests systests qpid-test-utils"/>
+ <property name="module.test.depends" value="perftests systests broker-core broker-plugins/memory-store broker-plugins/derby-store qpid-test-utils management/common broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol broker-plugins/amqp-1-0-protocol ${perftests.optional.test.depends}"/>
+
+ <import file="../module.xml"/>
+
+ <property name="xms" value="-Xms256m"/>
+ <property name="xmx" value="-Xmx1024m"/>
+ <property name="test.logging.level" value="-Damqj.test.logging.level=info"/>
+ <property name="qpid.logging.level" value="-Damqj.logging.level=warn"/>
+ <property name="log4j.config" value="-Dlog4j.configuration=perftests.log4j"/>
+ <property name="properties" value="perftests.properties"/>
+
+ <target name="release-bin" depends="release-bin-tasks"/>
+
+ <target name="libs-release" description="overridden to not copy depended-on modules or their dependencies, so that a perf tests release is not tied to a particular client version">
+ <!-- Copy the module dependencies -->
+ <echo message="${module.libs}"/>
+ <echo message="overridden to not copy qpid-client or its dependencies so that this release is not tied to a particular client version"/>
+
+ <copylist todir="${module.release}/lib" dir="${project.root}" files="${module.libs}"/>
+ <!-- Copy the jar for this module -->
+ <copy todir="${module.release}/lib" failonerror="true">
+ <fileset file="${module.jar}"/>
+ </copy>
+ </target>
+
+ <target name="copy-etc-release" description="override target from module.xml to set flatten=false">
+ <copy todir="${module.release}/etc" failonerror="false" flatten="false">
+ <fileset dir="${module.etc}"/>
+ </copy>
+ </target>
+
+</project>
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml (from r1577982, qpid/trunk/qpid/java/perftests/pom.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml?p2=qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml&p1=qpid/trunk/qpid/java/perftests/pom.xml&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/pom.xml (original)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/pom.xml Sun Mar 16 19:43:56 2014
@@ -6,9 +6,9 @@
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.
@@ -25,15 +25,27 @@
<relativePath>../qpid-systests-parent/pom.xml</relativePath>
</parent>
- <artifactId>qpid-perftests</artifactId>
- <name>Qpid Performance Tests</name>
- <description>Performance testing configuration, code and tests</description>
+ <artifactId>qpid-perftests-systests</artifactId>
+ <name>Qpid Performance Test System Tests</name>
+ <description>System testing using the performance testing module</description>
<properties>
<test.systest.resource.directory>${basedir}/../systests</test.systest.resource.directory>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-perftests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-systests</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- client deps -->
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -74,20 +86,6 @@
<scope>runtime</scope>
</dependency>
- <!-- test deps -->
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-systests</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Added: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java?rev=1578145&view=auto
==============================================================================
--- qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java (added)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/ConfigFileTestHelper.java Sun Mar 16 19:43:56 2014
@@ -0,0 +1,48 @@
+/*
+ * 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.systest.disttest;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import org.apache.qpid.disttest.controller.config.Config;
+import org.apache.qpid.disttest.controller.config.ConfigReader;
+
+public class ConfigFileTestHelper
+{
+ public static Reader getConfigFileReader(Class<?> testClass, String resourceName)
+ {
+ InputStream inputStream = testClass.getResourceAsStream(resourceName);
+ if(inputStream == null)
+ {
+ throw new RuntimeException("Can't find resource " + resourceName + " using classloader of class " + testClass);
+ }
+ Reader reader = new InputStreamReader(inputStream);
+ return reader;
+ }
+
+ public static Config getConfigFromResource(Class<?> testClass, String resourceName)
+ {
+ ConfigReader configReader = new ConfigReader();
+ Config config = configReader.readConfig(getConfigFileReader(testClass, resourceName));
+ return config;
+ }
+}
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/DistributedTestSystemTestBase.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/SystemTestConstants.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/SystemTestConstants.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/BasicDistributedClientTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ConsumerParticipantTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/DistributedClientTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/MessageProviderTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/clientonly/ProducerParticipantTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java (original)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/ControllerAndClientTest.java Sun Mar 16 19:43:56 2014
@@ -32,7 +32,7 @@ import javax.jms.Queue;
import javax.jms.Session;
import javax.naming.NamingException;
-import org.apache.qpid.disttest.ConfigFileTestHelper;
+import org.apache.qpid.systest.disttest.ConfigFileTestHelper;
import org.apache.qpid.disttest.client.Client;
import org.apache.qpid.disttest.client.ClientState;
import org.apache.qpid.disttest.controller.Controller;
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/iteratingFeature.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/produceClient.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndConsumerInSeparateClients.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/producerAndThreeConsumersInSeparateClients.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controllerandclient/testWithTwoTests.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java (original)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/DistributedControllerTest.java Sun Mar 16 19:43:56 2014
@@ -38,7 +38,7 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TemporaryQueue;
-import org.apache.qpid.disttest.ConfigFileTestHelper;
+import org.apache.qpid.systest.disttest.ConfigFileTestHelper;
import org.apache.qpid.disttest.controller.Controller;
import org.apache.qpid.disttest.controller.config.Config;
import org.apache.qpid.disttest.jms.ControllerJmsDelegate;
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/controlleronly/distributedControllerTest.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java (original)
+++ qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java Sun Mar 16 19:43:56 2014
@@ -36,8 +36,8 @@ import org.apache.qpid.util.FileUtils;
public class EndToEndTest extends QpidBrokerTestCase
{
private ControllerRunner _runner;
- private static final String TEST_CONFIG = "perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json";
- private static final String JNDI_CONFIG_FILE = "perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties";
+ private static final String TEST_CONFIG = "qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json";
+ private static final String JNDI_CONFIG_FILE = "qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties";
private static final String RUN1 = "run1";
public void testRunner() throws Exception
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/endtoend/endtoend.json&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Copied: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties (from r1577982, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties?p2=qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/perftests.systests.properties&p1=qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/systest/disttest/perftests.systests.properties&r1=1577982&r2=1578145&rev=1578145&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-systests-parent/pom.xml?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/qpid-systests-parent/pom.xml (original)
+++ qpid/trunk/qpid/java/qpid-systests-parent/pom.xml Sun Mar 16 19:43:56 2014
@@ -72,6 +72,8 @@
</dependencies>
<build>
+ <testSourceDirectory>src/main/java</testSourceDirectory>
+
<resources>
<resource>
<directory>src/main/resources</directory>
Modified: qpid/trunk/qpid/java/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/pom.xml?rev=1578145&r1=1578144&r2=1578145&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/pom.xml (original)
+++ qpid/trunk/qpid/java/systests/pom.xml Sun Mar 16 19:43:56 2014
@@ -185,8 +185,4 @@
</dependencies>
- <build>
- <testSourceDirectory>src/main/java</testSourceDirectory>
- </build>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org