QPID-8158: [Broker-J] [System Tests] Run protocol tests as part of unit tests


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/b91ddb20
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b91ddb20
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b91ddb20

Branch: refs/heads/master
Commit: b91ddb20ecd3b3178072ef39c08f47cf5ceb7e29
Parents: 5b756ec
Author: Alex Rudyy <oru...@apache.org>
Authored: Thu Apr 12 23:27:51 2018 +0100
Committer: Alex Rudyy <oru...@apache.org>
Committed: Thu Apr 12 23:27:51 2018 +0100

----------------------------------------------------------------------
 qpid-systests-parent/pom.xml                 | 2 +-
 systests/end-to-end-conversion-tests/pom.xml | 7 ++++++-
 systests/protocol-tests-amqp-0-10/pom.xml    | 3 ++-
 systests/protocol-tests-amqp-0-8/pom.xml     | 3 ++-
 systests/protocol-tests-amqp-1-0/pom.xml     | 3 ++-
 5 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b91ddb20/qpid-systests-parent/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index 6fb8b0d..3045799 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -31,7 +31,7 @@
   <description>Parent POM for Qpid system testing modules</description>
 
   <properties>
-    <skipITs>true</skipITs>
+    <skipITs>${skipTests}</skipITs>
   </properties>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b91ddb20/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..76da773 100644
--- a/systests/end-to-end-conversion-tests/pom.xml
+++ b/systests/end-to-end-conversion-tests/pom.xml
@@ -82,7 +82,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <skipTests>${skipITs}</skipTests>
                     <workingDirectory>${project.basedir}</workingDirectory>
                     <systemPropertyVariables>
                         
<qpid.initialConfigurationLocation>classpath:config-end-to-end-conversion-tests.json</qpid.initialConfigurationLocation>
@@ -94,6 +93,7 @@
                     <execution>
                         <id>0-9-1 -&gt; 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 +109,7 @@
                     <execution>
                         <id>1.0 -&gt; 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 +125,7 @@
                     <execution>
                         <id>0-10 -&gt; 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 +141,7 @@
                     <execution>
                         <id>1.0 -&gt; 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 +157,7 @@
                     <execution>
                         <id>0-9-1 -&gt; 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 +173,7 @@
                     <execution>
                         <id>0-10 -&gt; 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/b91ddb20/systests/protocol-tests-amqp-0-10/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-0-10/pom.xml 
b/systests/protocol-tests-amqp-0-10/pom.xml
index 53b049e..0d0cfe0 100644
--- a/systests/protocol-tests-amqp-0-10/pom.xml
+++ b/systests/protocol-tests-amqp-0-10/pom.xml
@@ -101,6 +101,7 @@
                     <systemPropertyVariables>
                         
<qpid.initialConfigurationLocation>classpath:config-protocol-tests-0-10.json</qpid.initialConfigurationLocation>
                     </systemPropertyVariables>
+                    <skipTests>${skipTests}</skipTests>
                 </configuration>
                 <executions>
                     <execution>
@@ -110,7 +111,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skipTests>${skipTests}</skipTests>
+                            <skipTests>true</skipTests>
                         </configuration>
                     </execution>
                 </executions>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b91ddb20/systests/protocol-tests-amqp-0-8/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-0-8/pom.xml 
b/systests/protocol-tests-amqp-0-8/pom.xml
index 4a99449..afe51e5 100644
--- a/systests/protocol-tests-amqp-0-8/pom.xml
+++ b/systests/protocol-tests-amqp-0-8/pom.xml
@@ -101,6 +101,7 @@
                     <systemPropertyVariables>
                         
<qpid.initialConfigurationLocation>classpath:config-protocol-tests-0-8.json</qpid.initialConfigurationLocation>
                     </systemPropertyVariables>
+                    <skipTests>${skipTests}</skipTests>
                 </configuration>
                 <executions>
                     <execution>
@@ -110,7 +111,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skipTests>${skipTests}</skipTests>
+                            <skipTests>true</skipTests>
                         </configuration>
                     </execution>
                 </executions>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b91ddb20/systests/protocol-tests-amqp-1-0/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml 
b/systests/protocol-tests-amqp-1-0/pom.xml
index 5cc7856..8cbaff9 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -121,6 +121,7 @@
                     <systemPropertyVariables>
                         
<qpid.initialConfigurationLocation>classpath:config-protocol-tests.json</qpid.initialConfigurationLocation>
                     </systemPropertyVariables>
+                    <skipTests>${skipTests}</skipTests>
                 </configuration>
                 <executions>
                     <execution>
@@ -130,7 +131,7 @@
                             <goal>test</goal>
                         </goals>
                         <configuration>
-                            <skipTests>${skipTests}</skipTests>
+                            <skipTests>true</skipTests>
                         </configuration>
                     </execution>
                 </executions>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to