Make v3 and v5 tests consistent

Signed-off-by: Ranjan-Dasgupta <[email protected]>
angry-2k · Jul 14, 2020 · c58f51c · c58f51c
1 parent 5408047
commit c58f51c
Show file tree

Hide file tree

Showing 60 changed files with 85 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,6 @@ before_install:
 
 script:
   - mvn -B clean -q
-#  - mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
-#  - mvn -B --projects org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
-  - mvn package
+  - mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
+  - mvn -B --projects org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
 
diff --git a/org.eclipse.paho.mqttv5.client.test/pom.xml b/org.eclipse.paho.mqttv5.client.test/pom.xml
@@ -1,63 +1,111 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.eclipse.paho</groupId>
         <artifactId>java-parent</artifactId>
         <version>1.2.5</version>
     </parent>
 
-    <groupId>org.eclipse.paho.mqttv5.client.test</groupId>
     <artifactId>org.eclipse.paho.mqttv5.client.test</artifactId>
     <version>1.2.5</version>
-    <name>org.eclipse.paho.mqttv5.client.test</name>
-
-    <url>http://maven.apache.org</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <packaging>jar</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.mqttv5.client</artifactId>
-            <version>1.2.5</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
                 <executions>
                     <execution>
+                        <id>attach-sources</id>
                         <goals>
-                            <goal>prepare-agent</goal>
+                            <goal>test-jar-no-fork</goal>
                         </goals>
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
                     <execution>
-                        <id>generate-test-report</id>
-                        <phase>test</phase>
                         <goals>
-                            <goal>report-aggregate</goal>
+                            <goal>test-jar</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.15</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <SERVER_URI>${test.server_uri}</SERVER_URI>
+                        <SERVER_SSL_PORT>${test.server_ssl_port}</SERVER_SSL_PORT>
+                        <SERVER_WEBSOCKET_URI>${test.server_websocket_uri}</SERVER_WEBSOCKET_URI>
+                    </systemPropertyVariables>
+                    <excludes>
+                        <exclude>${test.exclude}</exclude>
+                    </excludes>
+                    <runOrder>alphabetical</runOrder>
+                    <reuseForks>false</reuseForks>
+                    <forkCount>1</forkCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                 <groupId>org.jacoco</groupId>
+                      <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>${jacoco.version}</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                    <id>generate-test-report</id>
+                        <phase>test</phase>
+                        <goals>
+                        <goal>report-aggregate</goal>
+                        </goals>
+                        </execution>
+                    </executions>
+                </plugin>
         </plugins>
     </build>
-
-    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.mqttv5.client</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
 </project>
 
diff --git a/...se.paho.mqttv5.client.test/src/main/java/org/org/eclipse/paho/mqttv5/client/test/App.java b/...se.paho.mqttv5.client.test/src/main/java/org/org/eclipse/paho/mqttv5/client/test/App.java
diff --git a/...nt/internal/NetworkModuleServiceTest.java → ...nt/internal/NetworkModuleServiceTest.java b/...nt/internal/NetworkModuleServiceTest.java → ...nt/internal/NetworkModuleServiceTest.java
diff --git a/...paho/mqttv5/client/test/BasicSSLTest.java → ...paho/mqttv5/client/test/BasicSSLTest.java b/...paho/mqttv5/client/test/BasicSSLTest.java → ...paho/mqttv5/client/test/BasicSSLTest.java
diff --git a/...se/paho/mqttv5/client/test/BasicTest.java → ...se/paho/mqttv5/client/test/BasicTest.java b/...se/paho/mqttv5/client/test/BasicTest.java → ...se/paho/mqttv5/client/test/BasicTest.java
diff --git a/...paho/mqttv5/client/test/ClientIdTest.java → ...paho/mqttv5/client/test/ClientIdTest.java b/...paho/mqttv5/client/test/ClientIdTest.java → ...paho/mqttv5/client/test/ClientIdTest.java
diff --git a/.../mqttv5/client/test/PersistenceTests.java → .../mqttv5/client/test/PersistenceTests.java b/.../mqttv5/client/test/PersistenceTests.java → .../mqttv5/client/test/PersistenceTests.java
diff --git a/...paho/mqttv5/client/test/PublishTests.java → ...paho/mqttv5/client/test/PublishTests.java b/...paho/mqttv5/client/test/PublishTests.java → ...paho/mqttv5/client/test/PublishTests.java
diff --git a/...tv5/client/test/SendReceiveAsyncTest.java → ...tv5/client/test/SendReceiveAsyncTest.java b/...tv5/client/test/SendReceiveAsyncTest.java → ...tv5/client/test/SendReceiveAsyncTest.java
diff --git a/...t/ServerAssignedClientIdentifierTest.java → ...t/ServerAssignedClientIdentifierTest.java b/...t/ServerAssignedClientIdentifierTest.java → ...t/ServerAssignedClientIdentifierTest.java
diff --git a/...ho/mqttv5/client/test/SubscribeTests.java → ...ho/mqttv5/client/test/SubscribeTests.java b/...ho/mqttv5/client/test/SubscribeTests.java → ...ho/mqttv5/client/test/SubscribeTests.java
diff --git a/...aticReconnect/AutomaticReconnectTest.java → ...aticReconnect/AutomaticReconnectTest.java b/...aticReconnect/AutomaticReconnectTest.java → ...aticReconnect/AutomaticReconnectTest.java
diff --git a/...omaticReconnect/OfflineBufferingTest.java → ...omaticReconnect/OfflineBufferingTest.java b/...omaticReconnect/OfflineBufferingTest.java → ...omaticReconnect/OfflineBufferingTest.java
diff --git a/...ticReconnect/TopicAliasReconnectTest.java → ...ticReconnect/TopicAliasReconnectTest.java b/...ticReconnect/TopicAliasReconnectTest.java → ...ticReconnect/TopicAliasReconnectTest.java
diff --git a/...ient/test/client/MqttAsyncClientPaho.java → ...ient/test/client/MqttAsyncClientPaho.java b/...ient/test/client/MqttAsyncClientPaho.java → ...ient/test/client/MqttAsyncClientPaho.java
diff --git a/...nt/test/client/MqttClientFactoryPaho.java → ...nt/test/client/MqttClientFactoryPaho.java b/...nt/test/client/MqttClientFactoryPaho.java → ...nt/test/client/MqttClientFactoryPaho.java
diff --git a/...v5/client/test/client/MqttClientPaho.java → ...v5/client/test/client/MqttClientPaho.java b/...v5/client/test/client/MqttClientPaho.java → ...v5/client/test/client/MqttClientPaho.java
diff --git a/...st/connectionLoss/ConnectionLossTest.java → ...st/connectionLoss/ConnectionLossTest.java b/...st/connectionLoss/ConnectionLossTest.java → ...st/connectionLoss/ConnectionLossTest.java
diff --git a/...5/client/test/logging/ConsoleHandler.java → ...5/client/test/logging/ConsoleHandler.java b/...5/client/test/logging/ConsoleHandler.java → ...5/client/test/logging/ConsoleHandler.java
diff --git a/.../client/test/logging/DetailFormatter.java → .../client/test/logging/DetailFormatter.java b/.../client/test/logging/DetailFormatter.java → .../client/test/logging/DetailFormatter.java
diff --git a/...5/client/test/logging/HumanFormatter.java → ...5/client/test/logging/HumanFormatter.java b/...5/client/test/logging/HumanFormatter.java → ...5/client/test/logging/HumanFormatter.java
diff --git a/...tv5/client/test/logging/LoggerDumper.java → ...tv5/client/test/logging/LoggerDumper.java b/...tv5/client/test/logging/LoggerDumper.java → ...tv5/client/test/logging/LoggerDumper.java
diff --git a/...qttv5/client/test/logging/LoggerNode.java → ...qttv5/client/test/logging/LoggerNode.java b/...qttv5/client/test/logging/LoggerNode.java → ...qttv5/client/test/logging/LoggerNode.java
diff --git a/...client/test/logging/LoggingUtilities.java → ...client/test/logging/LoggingUtilities.java b/...client/test/logging/LoggingUtilities.java → ...client/test/logging/LoggingUtilities.java
diff --git a/.../client/test/logging/ObjectFormatter.java → .../client/test/logging/ObjectFormatter.java b/.../client/test/logging/ObjectFormatter.java → .../client/test/logging/ObjectFormatter.java
diff --git a/...5/client/test/logging/TraceFormatter.java → ...5/client/test/logging/TraceFormatter.java b/...5/client/test/logging/TraceFormatter.java → ...5/client/test/logging/TraceFormatter.java
diff --git a/...lient/test/properties/TestProperties.java → ...lient/test/properties/TestProperties.java b/...lient/test/properties/TestProperties.java → ...lient/test/properties/TestProperties.java
diff --git a/...es/ConnectionManipulationProxyServer.java → ...es/ConnectionManipulationProxyServer.java b/...es/ConnectionManipulationProxyServer.java → ...es/ConnectionManipulationProxyServer.java
diff --git a/...client/test/utilities/MqttV5Receiver.java → ...client/test/utilities/MqttV5Receiver.java b/...client/test/utilities/MqttV5Receiver.java → ...client/test/utilities/MqttV5Receiver.java
diff --git a/...lient/test/utilities/StringUtilities.java → ...lient/test/utilities/StringUtilities.java b/...lient/test/utilities/StringUtilities.java → ...lient/test/utilities/StringUtilities.java
diff --git a/...ities/TestByteArrayMemoryPersistence.java → ...ities/TestByteArrayMemoryPersistence.java b/...ities/TestByteArrayMemoryPersistence.java → ...ities/TestByteArrayMemoryPersistence.java
diff --git a/...t/test/utilities/TestClientUtilities.java → ...t/test/utilities/TestClientUtilities.java b/...t/test/utilities/TestClientUtilities.java → ...t/test/utilities/TestClientUtilities.java
diff --git a/...test/utilities/TestMemoryPersistence.java → ...test/utilities/TestMemoryPersistence.java b/...test/utilities/TestMemoryPersistence.java → ...test/utilities/TestMemoryPersistence.java
diff --git a/...mqttv5/client/test/utilities/Utility.java → ...mqttv5/client/test/utilities/Utility.java b/...mqttv5/client/test/utilities/Utility.java → ...mqttv5/client/test/utilities/Utility.java
diff --git a/...paho/mqttv5/common/MqttDataTypesTest.java → ...paho/mqttv5/common/MqttDataTypesTest.java b/...paho/mqttv5/common/MqttDataTypesTest.java → ...paho/mqttv5/common/MqttDataTypesTest.java
diff --git a/...ho/mqttv5/common/packet/MqttAuthTest.java → ...ho/mqttv5/common/packet/MqttAuthTest.java b/...ho/mqttv5/common/packet/MqttAuthTest.java → ...ho/mqttv5/common/packet/MqttAuthTest.java
diff --git a/...mqttv5/common/packet/MqttConnAckTest.java → ...mqttv5/common/packet/MqttConnAckTest.java b/...mqttv5/common/packet/MqttConnAckTest.java → ...mqttv5/common/packet/MqttConnAckTest.java
diff --git a/...mqttv5/common/packet/MqttConnectTest.java → ...mqttv5/common/packet/MqttConnectTest.java b/...mqttv5/common/packet/MqttConnectTest.java → ...mqttv5/common/packet/MqttConnectTest.java
diff --git a/...tv5/common/packet/MqttDisconnectTest.java → ...tv5/common/packet/MqttDisconnectTest.java b/...tv5/common/packet/MqttDisconnectTest.java → ...tv5/common/packet/MqttDisconnectTest.java
diff --git a/...mqttv5/common/packet/MqttPingReqTest.java → ...mqttv5/common/packet/MqttPingReqTest.java b/...mqttv5/common/packet/MqttPingReqTest.java → ...mqttv5/common/packet/MqttPingReqTest.java
diff --git a/...qttv5/common/packet/MqttPingRespTest.java → ...qttv5/common/packet/MqttPingRespTest.java b/...qttv5/common/packet/MqttPingRespTest.java → ...qttv5/common/packet/MqttPingRespTest.java
diff --git a/...tv5/common/packet/MqttPropertiesTest.java → ...tv5/common/packet/MqttPropertiesTest.java b/...tv5/common/packet/MqttPropertiesTest.java → ...tv5/common/packet/MqttPropertiesTest.java
diff --git a/.../mqttv5/common/packet/MqttPubAckTest.java → .../mqttv5/common/packet/MqttPubAckTest.java b/.../mqttv5/common/packet/MqttPubAckTest.java → .../mqttv5/common/packet/MqttPubAckTest.java
diff --git a/...mqttv5/common/packet/MqttPubCompTest.java → ...mqttv5/common/packet/MqttPubCompTest.java b/...mqttv5/common/packet/MqttPubCompTest.java → ...mqttv5/common/packet/MqttPubCompTest.java
diff --git a/.../mqttv5/common/packet/MqttPubRecTest.java → .../mqttv5/common/packet/MqttPubRecTest.java b/.../mqttv5/common/packet/MqttPubRecTest.java → .../mqttv5/common/packet/MqttPubRecTest.java
diff --git a/.../mqttv5/common/packet/MqttPubRelTest.java → .../mqttv5/common/packet/MqttPubRelTest.java b/.../mqttv5/common/packet/MqttPubRelTest.java → .../mqttv5/common/packet/MqttPubRelTest.java
diff --git a/...mqttv5/common/packet/MqttPublishTest.java → ...mqttv5/common/packet/MqttPublishTest.java b/...mqttv5/common/packet/MqttPublishTest.java → ...mqttv5/common/packet/MqttPublishTest.java
diff --git a/.../mqttv5/common/packet/MqttSubAckTest.java → .../mqttv5/common/packet/MqttSubAckTest.java b/.../mqttv5/common/packet/MqttSubAckTest.java → .../mqttv5/common/packet/MqttSubAckTest.java
diff --git a/...ttv5/common/packet/MqttSubscribeTest.java → ...ttv5/common/packet/MqttSubscribeTest.java b/...ttv5/common/packet/MqttSubscribeTest.java → ...ttv5/common/packet/MqttSubscribeTest.java
diff --git a/...qttv5/common/packet/MqttUnsubAckTest.java → ...qttv5/common/packet/MqttUnsubAckTest.java b/...qttv5/common/packet/MqttUnsubAckTest.java → ...qttv5/common/packet/MqttUnsubAckTest.java
diff --git a/...v5/common/packet/MqttUnsubscribeTest.java → ...v5/common/packet/MqttUnsubscribeTest.java b/...v5/common/packet/MqttUnsubscribeTest.java → ...v5/common/packet/MqttUnsubscribeTest.java
diff --git a/...ho/mqttv5/common/utils/MqttTopicTest.java → ...ho/mqttv5/common/utils/MqttTopicTest.java b/...ho/mqttv5/common/utils/MqttTopicTest.java → ...ho/mqttv5/common/utils/MqttTopicTest.java
diff --git a/...v5/common/utils/StringValidationTest.java → ...v5/common/utils/StringValidationTest.java b/...v5/common/utils/StringValidationTest.java → ...v5/common/utils/StringValidationTest.java
diff --git a/...aho.mqttv5.client.test/src/test/java/org/org/eclipse/paho/mqttv5/client/test/AppTest.java b/...aho.mqttv5.client.test/src/test/java/org/org/eclipse/paho/mqttv5/client/test/AppTest.java
diff --git a/...ent/src/test/resources/clientkeystore.jks → ...est/src/test/resources/clientkeystore.jks b/...ent/src/test/resources/clientkeystore.jks → ...est/src/test/resources/clientkeystore.jks
diff --git a/...nt/src/test/resources/i_can_eat_glass.txt → ...st/src/test/resources/i_can_eat_glass.txt b/...nt/src/test/resources/i_can_eat_glass.txt → ...st/src/test/resources/i_can_eat_glass.txt
diff --git a/...nt/src/test/resources/iot.eclipse.org.crt → ...st/src/test/resources/iot.eclipse.org.crt b/...nt/src/test/resources/iot.eclipse.org.crt → ...st/src/test/resources/iot.eclipse.org.crt
diff --git a/...ent/src/test/resources/logging.properties → ...est/src/test/resources/logging.properties b/...ent/src/test/resources/logging.properties → ...est/src/test/resources/logging.properties
diff --git a/...client/src/test/resources/test.properties → ...t.test/src/test/resources/test.properties b/...client/src/test/resources/test.properties → ...t.test/src/test/resources/test.properties