You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/04/13 12:49:38 UTC
[2/3] qpid-broker-j git commit: QPID-8158: [Broker-J] [System Tests]
Update README and cleanup legacy settings
QPID-8158: [Broker-J] [System Tests] Update README and cleanup legacy settings
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/c2cdab1e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c2cdab1e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c2cdab1e
Branch: refs/heads/master
Commit: c2cdab1ea2689066eb4736309cfe2db0dc078fec
Parents: bc671f5
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Apr 13 11:59:02 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Apr 13 13:49:30 2018 +0100
----------------------------------------------------------------------
README.md | 5 +++++
pom.xml | 6 ------
systests/end-to-end-conversion-tests/pom.xml | 6 ++++++
.../systests/QpidJmsClient0xConnectionBuilder.java | 17 +----------------
.../systests/QpidJmsClientConnectionBuilder.java | 13 -------------
5 files changed, 12 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6020d03..d07a7a5 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,11 @@ Perform a subset of tests on the packaged release artifacts without installing:
mvn verify -Dtest=TestNamePattern* -DfailIfNoTests=false
+Integration tests except for protocol tests are disabled by default.
+In order to run all integration tests, they need to be enabled with a flag -DskipITs=false, for example
+
+ mvn verify -DskipITs=false
+
Execute the tests and produce code coverage report:
mvn clean test jacoco:report
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 93930d3..34855a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -779,12 +779,6 @@
<!-- Defaults -->
<qpid.dest_syntax>BURL</qpid.dest_syntax>
- <test.port>0</test.port>
- <test.hport>0</test.hport>
- <test.port.ssl>0</test.port.ssl>
- <test.port.alt>0</test.port.alt>
- <test.port.alt.ssl>0</test.port.alt.ssl>
-
<!-- Profile Based Values -->
<profile>${profile}</profile>
<broker.version>${profile.broker.version}</broker.version>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/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 3979fa4..42a1a7d 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -94,6 +94,7 @@
<execution>
<id>0-9-1 -> 1.0</id>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<systemPropertyVariables>
<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>
@@ -109,6 +110,7 @@
<execution>
<id>1.0 -> 0-9-1</id>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<systemPropertyVariables>
<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>
@@ -124,6 +126,7 @@
<execution>
<id>0-10 -> 1.0</id>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<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>
@@ -139,6 +142,7 @@
<execution>
<id>1.0 -> 0-10</id>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<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>
@@ -154,6 +158,7 @@
<execution>
<id>0-9-1 -> 0-10</id>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<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>
@@ -169,6 +174,7 @@
<execution>
<id>0-10 -> 0-9-1</id>
<configuration>
+ <skipTests>${skipITs}</skipTests>
<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>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
index b9590f6..914cbe8 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClient0xConnectionBuilder.java
@@ -333,22 +333,7 @@ public class QpidJmsClient0xConnectionBuilder implements ConnectionBuilder
if (_enableFailover)
{
- if (_failoverPorts.isEmpty())
- {
- Integer testPortAlt;
- if ((testPortAlt = Integer.getInteger("test.port.alt")) != null)
- {
- copy.add(testPortAlt);
- }
- else if (_enableTls && (testPortAlt = Integer.getInteger("test.port.alt.ssl")) != null)
- {
- copy.add(testPortAlt);
- }
- }
- else
- {
- copy.addAll(_failoverPorts);
- }
+ copy.addAll(_failoverPorts);
}
final String transportQuery = buildTransportQuery();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c2cdab1e/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
index b5cb304..551ba20 100644
--- a/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
+++ b/systests/qpid-systests-jms-core/src/main/java/org/apache/qpid/systests/QpidJmsClientConnectionBuilder.java
@@ -331,19 +331,6 @@ public class QpidJmsClientConnectionBuilder implements ConnectionBuilder
final List<Integer> copy = new ArrayList<>(_failoverPorts.size() + 1);
copy.add(_enableTls ? _sslPort : _port);
-
- if (_failoverPorts.isEmpty())
- {
- Integer testPortAlt;
- if ((testPortAlt = Integer.getInteger("test.port.alt")) != null)
- {
- copy.add(testPortAlt);
- }
- else if (_enableTls && (testPortAlt = Integer.getInteger("test.port.alt.ssl")) != null)
- {
- copy.add(testPortAlt);
- }
- }
copy.addAll(_failoverPorts);
final String failover = copy.stream()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org