You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/08/25 15:03:05 UTC
[3/7] qpid-broker-j git commit: QPID-7896: [Java System Tests] By
default run the conversion tests six time
QPID-7896: [Java System Tests] By default run the conversion tests six time
* 0-9-1 <-> 1.0
* 0-10 <-> 1.0
* 0-9-1 <-> 0-10
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/14efcfca
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/14efcfca
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/14efcfca
Branch: refs/heads/master
Commit: 14efcfcaad43160ea52403caab5b81e8e04163d2
Parents: 0822e1a
Author: Lorenz Quack <lq...@apache.org>
Authored: Fri Aug 25 10:30:17 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Fri Aug 25 13:39:24 2017 +0100
----------------------------------------------------------------------
systests/end-to-end-conversion-tests/pom.xml | 96 +++++++++++++++++++----
1 file changed, 79 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/14efcfca/systests/end-to-end-conversion-tests/pom.xml
----------------------------------------------------------------------
diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml
index 0253f0a..76d8aff 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -37,10 +37,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<resolverVersion>1.0.3</resolverVersion>
<mavenVersion>3.5.0</mavenVersion>
- <client1Gavs>org.apache.qpid:qpid-jms-client:${qpid-jms-client-version}</client1Gavs>
- <client1AdditionalJavaArguments></client1AdditionalJavaArguments>
- <client2Gavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version}</client2Gavs>
- <client2AdditionalJavaArguments>-Dqpid.amqp.version=0-9-1</client2AdditionalJavaArguments>
+ <amqp10ClientGavs>org.apache.qpid:qpid-jms-client:${qpid-jms-client-version}</amqp10ClientGavs>
+ <amqp0xClientGavs>org.apache.qpid:qpid-client:${qpid-jms-client-amqp-0-x-version},org.apache.geronimo.specs:geronimo-jms_1.1_spec:${geronimo-jms-1-1-version}</amqp0xClientGavs>
</properties>
<dependencies>
@@ -90,7 +88,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <skipTests>${skipTests}</skipTests>
<workingDirectory>${project.basedir}</workingDirectory>
<systemPropertyVariables>
<qpid.initialConfigurationLocation>classpath:config-end-to-end-conversion-tests.json</qpid.initialConfigurationLocation>
@@ -100,15 +98,15 @@
</configuration>
<executions>
<execution>
- <id>client1 -> client2</id>
+ <id>0-9-1 -> 1.0</id>
<configuration>
<skip>false</skip>
<systemPropertyVariables>
- <qpid.systests.end_to_end_conversion.executionId>c1_c2</qpid.systests.end_to_end_conversion.executionId>
- <qpid.systests.end_to_end_conversion.publisherGavs>${client1Gavs}</qpid.systests.end_to_end_conversion.publisherGavs>
- <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>${client1AdditionalJavaArguments}</qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
- <qpid.systests.end_to_end_conversion.subscriberGavs>${client2Gavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
- <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>${client2AdditionalJavaArguments}</qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_1.0</qpid.systests.end_to_end_conversion.executionId>
+ <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
+ <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>-Dqpid.amqp.version=0-9-1</qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.subscriberGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
+ <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments></qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
</systemPropertyVariables>
</configuration>
<goals>
@@ -116,15 +114,79 @@
</goals>
</execution>
<execution>
- <id>client2 -> client1</id>
+ <id>1.0 -> 0-9-1</id>
<configuration>
<skip>false</skip>
<systemPropertyVariables>
- <qpid.systests.end_to_end_conversion.executionId>c2_c1</qpid.systests.end_to_end_conversion.executionId>
- <qpid.systests.end_to_end_conversion.publisherGavs>${client2Gavs}</qpid.systests.end_to_end_conversion.publisherGavs>
- <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>${client2AdditionalJavaArguments}</qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
- <qpid.systests.end_to_end_conversion.subscriberGavs>${client1Gavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
- <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>${client1AdditionalJavaArguments}</qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-9-1</qpid.systests.end_to_end_conversion.executionId>
+ <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
+ <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments></qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.subscriberGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
+ <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>-Dqpid.amqp.version=0-9-1</qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
+ </systemPropertyVariables>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>0-10 -> 1.0</id>
+ <configuration>
+ <skip>false</skip>
+ <systemPropertyVariables>
+ <qpid.systests.end_to_end_conversion.executionId>0-10_to_1.0</qpid.systests.end_to_end_conversion.executionId>
+ <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
+ <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>-Dqpid.amqp.version=0-10</qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.subscriberGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
+ <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments></qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
+ </systemPropertyVariables>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>1.0 -> 0-10</id>
+ <configuration>
+ <skip>false</skip>
+ <systemPropertyVariables>
+ <qpid.systests.end_to_end_conversion.executionId>1.0_to_0-10</qpid.systests.end_to_end_conversion.executionId>
+ <qpid.systests.end_to_end_conversion.publisherGavs>${amqp10ClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
+ <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments></qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.subscriberGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
+ <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>-Dqpid.amqp.version=0-10</qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
+ </systemPropertyVariables>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>0-9-1 -> 0-10</id>
+ <configuration>
+ <skip>false</skip>
+ <systemPropertyVariables>
+ <qpid.systests.end_to_end_conversion.executionId>0-9-1_to_0-10</qpid.systests.end_to_end_conversion.executionId>
+ <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
+ <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>-Dqpid.amqp.version=0-9-1</qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.subscriberGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
+ <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>-Dqpid.amqp.version=0-10</qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
+ </systemPropertyVariables>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>0-10 -> 0-9-1</id>
+ <configuration>
+ <skip>false</skip>
+ <systemPropertyVariables>
+ <qpid.systests.end_to_end_conversion.executionId>0-10_to_0-9-1</qpid.systests.end_to_end_conversion.executionId>
+ <qpid.systests.end_to_end_conversion.publisherGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.publisherGavs>
+ <qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>-Dqpid.amqp.version=0-10</qpid.systests.end_to_end_conversion.publisherAdditionalJavaArguments>
+ <qpid.systests.end_to_end_conversion.subscriberGavs>${amqp0xClientGavs}</qpid.systests.end_to_end_conversion.subscriberGavs>
+ <qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>-Dqpid.amqp.version=0-9-1</qpid.systests.end_to_end_conversion.subscriberAdditionalJavaArguments>
</systemPropertyVariables>
</configuration>
<goals>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org