You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/11/28 17:12:03 UTC
svn commit: r1771770 - in /qpid/java/trunk: ./ perftests/ perftests/etc/
perftests/src/main/assembly/
perftests/src/main/java/org/apache/qpid/disttest/jms/
perftests/src/test/java/org/apache/qpid/disttest/
perftests/src/test/java/org/apache/qpid/distte...
Author: kwall
Date: Mon Nov 28 17:12:03 2016
New Revision: 1771770
URL: http://svn.apache.org/viewvc?rev=1771770&view=rev
Log:
QPID-7555: [Perf Tests] Allow perftests to be invoked from the Maven POM
Added:
qpid/java/trunk/perftests/src/test/resources/
qpid/java/trunk/perftests/src/test/resources/jms-client/
qpid/java/trunk/perftests/src/test/resources/jms-client/jndi.properties
- copied, changed from r1771747, qpid/java/trunk/perftests/etc/perftests-jndi-qpid-jms-client.properties
qpid/java/trunk/perftests/src/test/resources/qpid-jms-client/
qpid/java/trunk/perftests/src/test/resources/qpid-jms-client/jndi.properties
- copied, changed from r1771747, qpid/java/trunk/perftests/etc/perftests-jndi.properties
Removed:
qpid/java/trunk/perftests/etc/perftests-jndi-qpid-jms-client.properties
qpid/java/trunk/perftests/etc/perftests-jndi.properties
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
qpid/java/trunk/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/QpidQueueCreatorTest.java
Modified:
qpid/java/trunk/perftests/pom.xml
qpid/java/trunk/perftests/src/main/assembly/qpid-perftests-bin.xml
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreatorFactory.java
qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java
qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
qpid/java/trunk/pom.xml
qpid/java/trunk/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/error.json
qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js
qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/iterations.json
qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json
qpid/java/trunk/tck/pom.xml
Modified: qpid/java/trunk/perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/pom.xml?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/pom.xml (original)
+++ qpid/java/trunk/perftests/pom.xml Mon Nov 28 17:12:03 2016
@@ -31,36 +31,43 @@
<properties>
<dependency-change-verification>true</dependency-change-verification>
- <!-- Overrides for system properties understood by Qpid JMS 0-8..0-10 client -->
- <qpid.amqp.version>0-9</qpid.amqp.version>
- <qpid.dest_syntax>BURL</qpid.dest_syntax>
- <qpid.close_timeout>90000</qpid.close_timeout>
+ <!-- Properties filtered into the JNDI properties -->
+ <perftests.messaging-hostpost-plain>localhost:5672</perftests.messaging-hostpost-plain>
+ <perftests.messaging-hostpost-tls>localhost:5672</perftests.messaging-hostpost-tls>
+ <perftests.messaging-user>guest</perftests.messaging-user>
+ <perftests.messaging-password>guest</perftests.messaging-password>
+ <perftests.results-directory>results</perftests.results-directory>
+
+ <!-- Properties used by the REST API Queue Creator -->
+ <perftests.manangement-user>guest</perftests.manangement-user>
+ <perftests.manangement-password>guest</perftests.manangement-password>
+ <perftests.broker-virtualhostnode>default</perftests.broker-virtualhostnode>
+ <perftests.broker-virtualhost>default</perftests.broker-virtualhost>
+ <perftests.manangement-url>http://localhost:8080</perftests.manangement-url>
+
+
+ <perftests.hillclimb>false</perftests.hillclimb>
+ <perftests.hillclimb.max_runs>3</perftests.hillclimb.max_runs>
+ <perftests.hillclimb.start_target_rate>1025.0</perftests.hillclimb.start_target_rate>
+ <perftests.hillclimb.production_to_target_ratio_success_threshold>0.95</perftests.hillclimb.production_to_target_ratio_success_threshold>
+ <perftests.hillclimb.consumption_to_production_ratio_success_threshold>0.95</perftests.hillclimb.consumption_to_production_ratio_success_threshold>
+ <perftests.hillclimb.minimum_delta>1.0</perftests.hillclimb.minimum_delta>
+ <perftests.hillclimb.bias>0.25</perftests.hillclimb.bias>
+
+ <!-- The following provide values for the disttest command line -->
+ <perftests.test-config>${basedir}/etc/testdefs</perftests.test-config>
+ <perftests.test-config.write_to_db>false</perftests.test-config.write_to_db>
+ <perftests.distributed>false</perftests.distributed>
<!-- Overrides for system properties understood by disttest itself -->
<qpid.disttest.loglevel>info</qpid.disttest.loglevel>
<qpid.disttest.duration>5000</qpid.disttest.duration>
- <qpid.disttest.distributed>false</qpid.disttest.distributed>
<qpid.disttest.registrationTimeout>60000</qpid.disttest.registrationTimeout>
<qpid.disttest.commandResponseTimeout>120000</qpid.disttest.commandResponseTimeout>
-
- <!-- The following provide values for the disttest command line -->
- <qpid.disttest.test_config>${basedir}/etc/testdefs</qpid.disttest.test_config>
- <qpid.disttest.hillclimb>false</qpid.disttest.hillclimb>
- <qpid.disttest.hillclimb.max_runs>3</qpid.disttest.hillclimb.max_runs>
- <qpid.disttest.hillclimb.start_target_rate>1025.0</qpid.disttest.hillclimb.start_target_rate>
- <qpid.disttest.hillclimb.production_to_target_ratio_success_threshold>0.95</qpid.disttest.hillclimb.production_to_target_ratio_success_threshold>
- <qpid.disttest.hillclimb.consumption_to_production_ratio_success_threshold>0.95</qpid.disttest.hillclimb.consumption_to_production_ratio_success_threshold>
- <qpid.disttest.hillclimb.minimum_delta>1.0</qpid.disttest.hillclimb.minimum_delta>
- <qpid.disttest.hillclimb.bias>0.25</qpid.disttest.hillclimb.bias>
</properties>
<dependencies>
<!-- client deps -->
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-client</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -139,6 +146,10 @@
</testResource>
<testResource>
<directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
</testResource>
</testResources>
@@ -171,63 +182,6 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin-version}</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.apache.qpid.disttest.ControllerRunner</mainClass>
- <arguments>
- <argument>jndi-config=${basedir}/etc/perftests-jndi.properties</argument>
- <argument>test-config=${qpid.disttest.test_config}</argument>
- <argument>distributed=${qpid.disttest.distributed}</argument>
- <argument>writeToDb=false</argument>
- <argument>registrationTimeout=${qpid.disttest.registrationTimeout}</argument>
- <argument>commandResponseTimeout=${qpid.disttest.commandResponseTimeout}</argument>
- <argument>hill-climb=${qpid.disttest.hillclimb}</argument>
- <argument>hill-climber.max-runs=${qpid.disttest.hillclimb.max_runs}</argument>
- <argument>hill-climber.start-target-rate=${qpid.disttest.hillclimb.start_target_rate}</argument>
- <argument>hill-climber.production-to-target-ratio-success-threshold=${qpid.disttest.hillclimb.production_to_target_ratio_success_threshold}</argument>
- <argument>hill-climber.consumption-to-production-ratio-success-threshold=${qpid.disttest.hillclimb.consumption_to_production_ratio_success_threshold}</argument>
- <argument>hill-climber.minimum-delta=${qpid.disttest.hillclimb.minimum_delta}</argument>
- <argument>hill-climber.bias=${qpid.disttest.hillclimb.bias}</argument>
- </arguments>
- <classpathScope>compile</classpathScope>
- <systemProperties>
- <systemProperty>
- <key>qpid.disttest.loglevel</key>
- <value>${qpid.disttest.loglevel}</value>
- </systemProperty>
- <systemProperty>
- <key>qpid.disttest.duration</key>
- <value>${qpid.disttest.duration}</value>
- </systemProperty>
- <systemProperty>
- <key>qpid.amqp.version</key>
- <value>${qpid.amqp.version}</value>
- </systemProperty>
- <systemProperty>
- <key>qpid.dest_syntax</key>
- <value>${qpid.dest_syntax}</value>
- </systemProperty>
- <systemProperty>
- <key>qpid.close_timeout</key>
- <value>${qpid.close_timeout}</value>
- </systemProperty>
- <systemProperty>
- <key>java.naming.factory.initial</key>
- <value>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -239,70 +193,145 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>qpid-jms-client</id>
+ <id>perftests</id>
<activation>
<property>
- <name>client</name>
- <value>qpid-jms-client</value>
+ <name>perftests</name>
</property>
</activation>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>perftests</property>
+ <regex>^(qpid-jms-client)|(jms-client-0-9)|(jms-client-0-10)$</regex>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin-version}</version>
<executions>
<execution>
+ <id>run-perftests</id>
<goals>
<goal>java</goal>
</goals>
+ <phase>integration-test</phase>
+ <configuration>
+ <mainClass>org.apache.qpid.disttest.ControllerRunner</mainClass>
+ <classpathScope>compile</classpathScope>
+ <arguments>
+ <argument>jndi-config=${java.naming.provider.url}</argument>
+ <argument>test-config=${perftests.test-config}</argument>
+ <argument>distributed=${perftests.distributed}</argument>
+ <argument>writeToDb=${perftests.test-config.write_to_db}</argument>
+ <argument>registrationTimeout=${qpid.disttest.registrationTimeout}</argument>
+ <argument>commandResponseTimeout=${qpid.disttest.commandResponseTimeout}</argument>
+ <argument>hill-climb=${perftests.hillclimb}</argument>
+ <argument>hill-climber.max-runs=${perftests.hillclimb.max_runs}</argument>
+ <argument>hill-climber.start-target-rate=${perftests.hillclimb.start_target_rate}</argument>
+ <argument>hill-climber.production-to-target-ratio-success-threshold=${perftests.hillclimb.production_to_target_ratio_success_threshold}</argument>
+ <argument>hill-climber.consumption-to-production-ratio-success-threshold=${perftests.hillclimb.consumption_to_production_ratio_success_threshold}</argument>
+ <argument>hill-climber.minimum-delta=${perftests.hillclimb.minimum_delta}</argument>
+ <argument>hill-climber.bias=${perftests.hillclimb.bias}</argument>
+ </arguments>
+ <systemProperties>
+ <systemProperty>
+ <key>qpid.disttest.loglevel</key>
+ <value>${qpid.disttest.loglevel}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>qpid.disttest.duration</key>
+ <value>${qpid.disttest.duration}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>java.naming.factory.initial</key>
+ <value>${java.naming.factory.initial}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>qpid.disttest.queue.creator.class</key>
+ <value>org.apache.qpid.disttest.jms.QpidRestAPIQueueCreator</value>
+ </systemProperty>
+ <systemProperty>
+ <key>perftests.manangement-user</key>
+ <value>${perftests.manangement-user}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>perftests.manangement-password</key>
+ <value>${perftests.manangement-password}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>perftests.broker-virtualhostnode</key>
+ <value>${perftests.broker-virtualhostnode}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>perftests.broker-virtualhost</key>
+ <value>${perftests.broker-virtualhost}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>perftests.manangement-url</key>
+ <value>${perftests.manangement-url}</value>
+ </systemProperty>
+ <!-- The following two are used by the legacy client only -->
+ <systemProperty>
+ <key>qpid.dest_syntax</key>
+ <value>${qpid.dest_syntax}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>qpid.amqp.version</key>
+ <value>${qpid.amqp.version}</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
</execution>
</executions>
- <configuration>
- <mainClass>org.apache.qpid.disttest.ControllerRunner</mainClass>
- <arguments>
- <argument>jndi-config=${basedir}/etc/perftests-jndi-qpid-jms-client.properties</argument>
- <argument>test-config=${qpid.disttest.test_config}</argument>
- <argument>distributed=false</argument>
- <argument>writeToDb=false</argument>
- <argument>registrationTimeout=${qpid.disttest.registrationTimeout}</argument>
- <argument>commandResponseTimeout=${qpid.disttest.commandResponseTimeout}</argument>
- <argument>hill-climb=${qpid.disttest.hillclimb}</argument>
- <argument>hill-climber.max-runs=${qpid.disttest.hillclimb.max_runs}</argument>
- <argument>hill-climber.start-target-rate=${qpid.disttest.hillclimb.start_target_rate}</argument>
- <argument>hill-climber.production-to-target-ratio-success-threshold=${qpid.disttest.hillclimb.production_to_target_ratio_success_threshold}</argument>
- <argument>hill-climber.consumption-to-production-ratio-success-threshold=${qpid.disttest.hillclimb.consumption_to_production_ratio_success_threshold}</argument>
- <argument>hill-climber.minimum-delta=${qpid.disttest.hillclimb.minimum_delta}</argument>
- <argument>hill-climber.bias=${qpid.disttest.hillclimb.bias}</argument>
- </arguments>
- <classpathScope>compile</classpathScope>
- <systemProperties>
- <systemProperty>
- <key>qpid.disttest.loglevel</key>
- <value>${qpid.disttest.loglevel}</value>
- </systemProperty>
- <systemProperty>
- <key>qpid.disttest.duration</key>
- <value>${qpid.disttest.duration}</value>
- </systemProperty>
- <systemProperty>
- <key>java.naming.factory.initial</key>
- <value>org.apache.qpid.jms.jndi.JmsInitialContextFactory</value>
- </systemProperty>
- <systemProperty>
- <key>qpid.disttest.queue.creator.class</key>
- <value>org.apache.qpid.disttest.jms.QpidRestAPIQueueCreator</value>
- </systemProperty>
- </systemProperties>
- </configuration>
</plugin>
</plugins>
</build>
+ </profile>
+
+ <profile>
+ <id>qpid-jms-client</id>
+ <activation>
+ <property>
+ <name>perftests</name>
+ <value>qpid-jms-client</value>
+ </property>
+ </activation>
+ <properties>
+ <java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</java.naming.factory.initial>
+ <java.naming.provider.url>${project.build.directory}/test-classes/qpid-jms-client/jndi.properties</java.naming.provider.url>
+ <qpid.amqp.version></qpid.amqp.version>
+ <qpid.dest_syntax></qpid.dest_syntax>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -311,6 +340,53 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>jms-client-0-9</id>
+ <activation>
+ <property>
+ <name>perftests</name>
+ <value>jms-client-0-9</value>
+ </property>
+ </activation>
+ <properties>
+ <java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
+ <java.naming.provider.url>${project.build.directory}/test-classes/jms-client/jndi.properties</java.naming.provider.url>
+ <qpid.amqp.version>0-9</qpid.amqp.version>
+ <qpid.dest_syntax>BURL</qpid.dest_syntax>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${qpid.legacy.jms.client.groupid}</groupId>
+ <artifactId>${qpid.legacy.jms.client.artifactid}</artifactId>
+ <version>${qpid.legacy.jms.client.version}</version>
+ <type>${qpid.legacy.jms.client.type}</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jms-client-0-10</id>
+ <activation>
+ <property>
+ <name>perftests</name>
+ <value>jms-client-0-10</value>
+ </property>
+ </activation>
+ <properties>
+ <java.naming.factory.initial>org.apache.qpid.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
+ <java.naming.provider.url>${project.build.directory}/test-classes/jms-client/jndi.properties</java.naming.provider.url>
+ <qpid.amqp.version>0-10</qpid.amqp.version>
+ <qpid.dest_syntax>BURL</qpid.dest_syntax>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${qpid.legacy.jms.client.groupid}</groupId>
+ <artifactId>${qpid.legacy.jms.client.artifactid}</artifactId>
+ <version>${qpid.legacy.jms.client.version}</version>
+ <type>${qpid.legacy.jms.client.type}</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
-
</project>
Modified: qpid/java/trunk/perftests/src/main/assembly/qpid-perftests-bin.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/assembly/qpid-perftests-bin.xml?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/assembly/qpid-perftests-bin.xml (original)
+++ qpid/java/trunk/perftests/src/main/assembly/qpid-perftests-bin.xml Mon Nov 28 17:12:03 2016
@@ -51,11 +51,6 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
- <excludes>
- <!-- Exclude client artifacts, user provides appropriate version -->
- <exclude>org.apache.qpid:qpid-client</exclude>
- <exclude>org.apache.qpid:qpid-common</exclude>
- </excludes>
</dependencySet>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreatorFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreatorFactory.java?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreatorFactory.java (original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreatorFactory.java Mon Nov 28 17:12:03 2016
@@ -29,7 +29,7 @@ public class QpidQueueCreatorFactory
{
private static final Logger LOGGER = LoggerFactory.getLogger(QpidQueueCreatorFactory.class);
- private static final String QUEUE_CREATOR_CLASS_NAME_SYSTEM_PROPERTY = "qpid.disttest.queue.creator.class";
+ public static final String QUEUE_CREATOR_CLASS_NAME_SYSTEM_PROPERTY = "qpid.disttest.queue.creator.class";
private QpidQueueCreatorFactory()
{
@@ -40,7 +40,7 @@ public class QpidQueueCreatorFactory
String queueCreatorClassName = System.getProperty(QUEUE_CREATOR_CLASS_NAME_SYSTEM_PROPERTY);
if(queueCreatorClassName == null)
{
- queueCreatorClassName = QpidQueueCreator.class.getName();
+ queueCreatorClassName = NoOpQueueCreator.class.getName();
}
else
{
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/ArgumentParserTest.java Mon Nov 28 17:12:03 2016
@@ -35,7 +35,7 @@ public class ArgumentParserTest extends
public static final String DISTRIBUTED_PROP = "distributed";
public static final String TEST_CONFIG_DEFAULT = "perftests-config.json";
- public static final String JNDI_CONFIG_DEFAULT = "perftests-jndi.properties";
+ public static final String JNDI_CONFIG_DEFAULT = "jndi.properties";
public static final String DISTRIBUTED_DEFAULT = "false";
private Map<String,String> _options = new HashMap<String, String>();
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/db/ResultsDbWriterTest.java Mon Nov 28 17:12:03 2016
@@ -45,7 +45,7 @@ import org.apache.qpid.disttest.db.Resul
import org.apache.qpid.disttest.message.ParticipantResult;
import org.apache.qpid.disttest.results.ResultsTestFixture;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.util.FileUtils;
+import org.apache.qpid.test.utils.TestFileUtils;
public class ResultsDbWriterTest extends QpidTestCase
{
@@ -69,7 +69,7 @@ public class ResultsDbWriterTest extends
{
try
{
- FileUtils.deleteDirectory(_tempDbDirectory.getAbsolutePath());
+ TestFileUtils.delete(_tempDbDirectory, true);
}
finally
{
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsCsvWriterTest.java Mon Nov 28 17:12:03 2016
@@ -23,15 +23,16 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.List;
+import com.google.common.io.Resources;
+
import org.apache.qpid.disttest.controller.ResultsForAllTests;
-import org.apache.qpid.disttest.results.ResultsCsvWriter;
import org.apache.qpid.disttest.results.aggregation.ITestResult;
import org.apache.qpid.disttest.results.formatting.CSVFormatter;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
public class ResultsCsvWriterTest extends QpidTestCase
{
@@ -48,7 +49,7 @@ public class ResultsCsvWriterTest extend
_resultsFileWriter.setCsvFormater(_csvFormater);
}
- public void testWriteResultsToFile()
+ public void testWriteResultsToFile() throws Exception
{
List<ITestResult> testResult1 = mock(List.class);
ResultsForAllTests results1 = mock(ResultsForAllTests.class);
@@ -69,19 +70,20 @@ public class ResultsCsvWriterTest extend
_resultsFileWriter.writeResults(results1, "config1.json");
File resultsFile1 = new File(_outputDir, "config1.csv");
- assertEquals(expectedCsvContents1, FileUtils.readFileAsString(resultsFile1));
+
+ assertEquals(expectedCsvContents1, Resources.toString(resultsFile1.toURI().toURL(), StandardCharsets.UTF_8));
_resultsFileWriter.writeResults(results2, "config2.json");
File resultsFile2 = new File(_outputDir, "config2.csv");
- assertEquals(expectedCsvContents2, FileUtils.readFileAsString(resultsFile2));
+ assertEquals(expectedCsvContents2, Resources.toString(resultsFile2.toURI().toURL(), StandardCharsets.UTF_8));
when(_csvFormater.format(any(List.class))).thenReturn(expectedSummaryFileContents);
_resultsFileWriter.end();
File summaryFile = new File(_outputDir, ResultsCsvWriter.TEST_SUMMARY_FILE_NAME);
- assertEquals(expectedSummaryFileContents, FileUtils.readFileAsString(summaryFile));
+ assertEquals(expectedSummaryFileContents, Resources.toString(summaryFile.toURI().toURL(), StandardCharsets.UTF_8));
}
Modified: qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java (original)
+++ qpid/java/trunk/perftests/src/test/java/org/apache/qpid/disttest/results/ResultsXmlWriterTest.java Mon Nov 28 17:12:03 2016
@@ -24,14 +24,16 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
+import com.google.common.io.Resources;
+
import org.apache.qpid.disttest.controller.ResultsForAllTests;
import org.apache.qpid.disttest.message.ParticipantResult;
import org.apache.qpid.disttest.results.aggregation.ITestResult;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
public class ResultsXmlWriterTest extends QpidTestCase
{
@@ -39,7 +41,7 @@ public class ResultsXmlWriterTest extend
private ResultsWriter _resultsFileWriter = new ResultsXmlWriter(_outputDir);
- public void testResultForNoTests()
+ public void testResultForNoTests() throws Exception
{
ResultsForAllTests resultsForAllTests = mock(ResultsForAllTests.class);
@@ -50,10 +52,10 @@ public class ResultsXmlWriterTest extend
File resultsFile = new File(_outputDir, "config.xml");
- assertEquals(expectedXmlContent, FileUtils.readFileAsString(resultsFile));
+ assertEquals(expectedXmlContent, Resources.toString(resultsFile.toURI().toURL(), StandardCharsets.UTF_8));
}
- public void testResultForOneTest()
+ public void testResultForOneTest() throws Exception
{
ITestResult test = mock(ITestResult.class);
when(test.getName()).thenReturn("mytest");
@@ -70,10 +72,10 @@ public class ResultsXmlWriterTest extend
File resultsFile = new File(_outputDir, "config.xml");
- assertEquals(expectedXmlContent, FileUtils.readFileAsString(resultsFile));
+ assertEquals(expectedXmlContent, Resources.toString(resultsFile.toURI().toURL(), StandardCharsets.UTF_8));
}
- public void testResultForOneTestWithError()
+ public void testResultForOneTestWithError() throws Exception
{
ParticipantResult resultWithError = mock(ParticipantResult.class);
when(resultWithError.hasError()).thenReturn(true);
@@ -98,7 +100,7 @@ public class ResultsXmlWriterTest extend
File resultsFile = new File(_outputDir, "config.xml");
- assertEquals(expectedXmlContent, FileUtils.readFileAsString(resultsFile));
+ assertEquals(expectedXmlContent, Resources.toString(resultsFile.toURI().toURL(), StandardCharsets.UTF_8));
}
}
Copied: qpid/java/trunk/perftests/src/test/resources/jms-client/jndi.properties (from r1771747, qpid/java/trunk/perftests/etc/perftests-jndi-qpid-jms-client.properties)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/resources/jms-client/jndi.properties?p2=qpid/java/trunk/perftests/src/test/resources/jms-client/jndi.properties&p1=qpid/java/trunk/perftests/etc/perftests-jndi-qpid-jms-client.properties&r1=1771747&r2=1771770&rev=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/etc/perftests-jndi-qpid-jms-client.properties (original)
+++ qpid/java/trunk/perftests/src/test/resources/jms-client/jndi.properties Mon Nov 28 17:12:03 2016
@@ -1,5 +1,4 @@
#
-#
# 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
@@ -19,12 +18,12 @@
#
#
-
-connectionfactory.connectionfactory = amqp://localhost:5672/?jms.username=guest&jms.password=guest&jms.forceAsyncAcks=true
-connectionfactory.sslconnectionfactory = amqps://localhost:5671/?jms.username=guest&jms.password=guest&jms.forceAsyncAcks=true
+connectionfactory.connectionfactory = amqp://${perftests.messaging-user}:${perftests.messaging-password}@clientid/?brokerlist='${perftests.messaging-hostpost-plain}'
+connectionfactory.sslconnectionfactory = amqp://${perftests.messaging-user}:${perftests.messaging-password}@clientid/?ssl='true'&brokerlist='${perftests.messaging-hostpost-tls}'
queue.controllerqueue = controllerqueue
jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver
# writes to a results database in ./perftestResultsDb by default.
-jdbcUrl=jdbc:derby:perftestResultsDirectory;create=true
+jdbcUrl=jdbc:derby:${perftests.results-directory};create=true
+
Copied: qpid/java/trunk/perftests/src/test/resources/qpid-jms-client/jndi.properties (from r1771747, qpid/java/trunk/perftests/etc/perftests-jndi.properties)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/test/resources/qpid-jms-client/jndi.properties?p2=qpid/java/trunk/perftests/src/test/resources/qpid-jms-client/jndi.properties&p1=qpid/java/trunk/perftests/etc/perftests-jndi.properties&r1=1771747&r2=1771770&rev=1771770&view=diff
==============================================================================
--- qpid/java/trunk/perftests/etc/perftests-jndi.properties (original)
+++ qpid/java/trunk/perftests/src/test/resources/qpid-jms-client/jndi.properties Mon Nov 28 17:12:03 2016
@@ -1,3 +1,4 @@
+#
# 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
@@ -14,18 +15,14 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
-brokerHostPortPlain=tcp://localhost:5672
-brokerHostPortSsl=tcp://localhost:5671
-perftestResultsDirectory=perftestResultsDb
-username=guest
-password=guest
-
-connectionfactory.connectionfactory = amqp://${username}:${password}@clientid/?brokerlist='${brokerHostPortPlain}'
-connectionfactory.sslconnectionfactory = amqp://${username}:${password}@clientid/?ssl='true'&brokerlist='${brokerHostPortSsl}'
+connectionfactory.connectionfactory = amqp://${perftests.messaging-hostpost-plain}/?jms.username=${perftests.messaging-user}&jms.password=${perftests.messaging-password}&jms.forceAsyncAcks=true
+connectionfactory.sslconnectionfactory = amqps://${perftests.messaging-hostpost-tls}/?jms.username=${perftests.messaging-user}&jms.password=${perftests.messaging-password}&jms.forceAsyncAcks=true
queue.controllerqueue = controllerqueue
jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver
# writes to a results database in ./perftestResultsDb by default.
-jdbcUrl=jdbc:derby:${perftestResultsDirectory};create=true
+jdbcUrl=jdbc:derby:${perftests.results-directory};create=true
Modified: qpid/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Mon Nov 28 17:12:03 2016
@@ -162,6 +162,11 @@
<maven-docbx-plugin-version>2.0.15</maven-docbx-plugin-version>
<maven-docbook-xml-plugin-version>5.0-all</maven-docbook-xml-plugin-version>
+ <qpid.legacy.jms.client.groupid>org.apache.qpid</qpid.legacy.jms.client.groupid>
+ <qpid.legacy.jms.client.artifactid>qpid-client</qpid.legacy.jms.client.artifactid>
+ <qpid.legacy.jms.client.version>${project.version}</qpid.legacy.jms.client.version>
+ <qpid.legacy.jms.client.type>jar</qpid.legacy.jms.client.type>
+
<!-- These versions needs to be kept in sync with versions in parent pom-->
<maven-project-info-reports-plugin-version>2.8</maven-project-info-reports-plugin-version>
<maven-failsafe-and-surefire-plugins-version>2.18.1</maven-failsafe-and-surefire-plugins-version>
Modified: qpid/java/trunk/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java (original)
+++ qpid/java/trunk/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java Mon Nov 28 17:12:03 2016
@@ -37,8 +37,11 @@ import java.util.Map;
import org.apache.qpid.disttest.ControllerRunner;
import org.apache.qpid.disttest.DistributedTestException;
+import org.apache.qpid.disttest.jms.QpidQueueCreatorFactory;
+import org.apache.qpid.disttest.jms.QpidRestAPIQueueCreator;
import org.apache.qpid.disttest.message.ParticipantAttribute;
import org.apache.qpid.disttest.results.aggregation.TestResultAggregator;
+import org.apache.qpid.systest.rest.RestTestHelper;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.util.FileUtils;
@@ -57,7 +60,12 @@ public class EndToEndTest extends QpidBr
@Override
public void setUp() throws Exception
{
+ getDefaultBrokerConfiguration().addHttpManagementConfiguration();
super.setUp();
+ setSystemProperty("perftests.manangement-url", String.format("http://localhost:%d", getDefaultBroker().getHttpPort()));
+ setSystemProperty("perftests.broker-virtualhostnode", "test");
+ setSystemProperty("perftests.broker-virtualhost", "test");
+ setSystemProperty(QpidQueueCreatorFactory.QUEUE_CREATOR_CLASS_NAME_SYSTEM_PROPERTY, QpidRestAPIQueueCreator.class.getName());
_outputDir = createTemporaryOutputDirectory();
assertTrue("Output dir must not exist", _outputDir.isDirectory());
}
Modified: qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/error.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/error.json?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/error.json (original)
+++ qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/error.json Mon Nov 28 17:12:03 2016
@@ -24,7 +24,7 @@
"_name": "TestWillError",
"_queues":[
{
- "_name": "direct://amq.direct//testQueue"
+ "_name": "testQueue"
}
],
"_clients":[
Modified: qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js (original)
+++ qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js Mon Nov 28 17:12:03 2016
@@ -24,8 +24,6 @@ var acknowledgeMode = 0;
var deliveryMode = 2;
var queueName = "testQueueHillClimbing";
-var destination = "BURL:direct://amq.direct//".concat(queueName)
- .concat("?durable='true'");
var test = {
"_name": "HillClimbing",
@@ -43,7 +41,7 @@ var test = {
"_acknowledgeMode": acknowledgeMode,
"_producers": [{
"_name": "Producer1",
- "_destinationName": destination,
+ "_destinationName": queueName,
"_deliveryMode": deliveryMode,
"_maximumDuration": duration
}]
@@ -59,7 +57,7 @@ var test = {
"_acknowledgeMode": acknowledgeMode,
"_consumers": [{
"_name": "Consumer1",
- "_destinationName": destination,
+ "_destinationName": queueName,
"_maximumDuration": duration
}]
}]
Modified: qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/iterations.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/iterations.json?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/iterations.json (original)
+++ qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/iterations.json Mon Nov 28 17:12:03 2016
@@ -32,7 +32,7 @@
],
"_queues":[
{
- "_name": "direct://amq.direct//testQueue"
+ "_name": "testQueue"
}
],
"_clients":[
@@ -48,7 +48,7 @@
"_producers": [
{
"_name": "participantProducer1",
- "_destinationName": "direct://amq.direct//testQueue",
+ "_destinationName": "testQueue",
"_numberOfMessages": 10
}
]
@@ -69,7 +69,7 @@
"_consumers": [
{
"_name": "participantConsumer1",
- "_destinationName": "direct://amq.direct//testQueue",
+ "_destinationName": "testQueue",
"_numberOfMessages": 10
}
]
Modified: qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json (original)
+++ qpid/java/trunk/qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json Mon Nov 28 17:12:03 2016
@@ -24,10 +24,10 @@
"_name": "ManyParticipants",
"_queues":[
{
- "_name": "direct://amq.direct//testQueue1"
+ "_name": "testQueue1"
},
{
- "_name": "direct://amq.direct//testQueue2"
+ "_name": "testQueue2"
}
],
"_clients":[
@@ -43,7 +43,7 @@
"_producers": [
{
"_name": "participantProducer1",
- "_destinationName": "direct://amq.direct//testQueue1",
+ "_destinationName": "testQueue1",
"_numberOfMessages": 10
}
]
@@ -64,7 +64,7 @@
"_producers": [
{
"_name": "participantProducer2",
- "_destinationName": "direct://amq.direct//testQueue2",
+ "_destinationName": "testQueue2",
"_numberOfMessages": 10
}
]
@@ -85,7 +85,7 @@
"_consumers": [
{
"_name": "participantConsumer1",
- "_destinationName": "direct://amq.direct//testQueue1",
+ "_destinationName": "testQueue1",
"_numberOfMessages": 10
}
]
@@ -101,7 +101,7 @@
"_consumers": [
{
"_name": "participantConsumer2",
- "_destinationName": "direct://amq.direct//testQueue2",
+ "_destinationName": "testQueue2",
"_numberOfMessages": 10
}
]
Modified: qpid/java/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/tck/pom.xml?rev=1771770&r1=1771769&r2=1771770&view=diff
==============================================================================
--- qpid/java/trunk/tck/pom.xml (original)
+++ qpid/java/trunk/tck/pom.xml Mon Nov 28 17:12:03 2016
@@ -47,11 +47,6 @@
<tck.work.directory>${project.build.directory}/${tck}/work</tck.work.directory>
<tck.ts.jte>${project.build.testOutputDirectory}/ts.jte</tck.ts.jte>
<tck.test>com/</tck.test>
-
- <qpid.legacy.jms.client.groupid>org.apache.qpid</qpid.legacy.jms.client.groupid>
- <qpid.legacy.jms.client.artifactid>qpid-client</qpid.legacy.jms.client.artifactid>
- <qpid.legacy.jms.client.version>${project.version}</qpid.legacy.jms.client.version>
- <qpid.legacy.jms.client.type>jar</qpid.legacy.jms.client.type>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org