Skip to content

Commit c58f51c

Browse files
Ranjan-DasguptaRanjan-Dasgupta
Ranjan-Dasgupta
authored and
Ranjan-Dasgupta
committed
Make v3 and v5 tests consistent
Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>
1 parent 5408047 commit c58f51c

60 files changed

Lines changed: 85 additions & 89 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ before_install:
1313

1414
script:
1515
- mvn -B clean -q
16-
# - mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
17-
# - mvn -B --projects org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
18-
- mvn package
16+
- mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
17+
- mvn -B --projects org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
1918

‎org.eclipse.paho.mqttv5.client.test/pom.xml‎

Lines changed: 83 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,111 @@
1-
<?xml version="1.0"?>
2-
<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"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
43
<modelVersion>4.0.0</modelVersion>
5-
64
<parent>
75
<groupId>org.eclipse.paho</groupId>
86
<artifactId>java-parent</artifactId>
97
<version>1.2.5</version>
108
</parent>
119

12-
<groupId>org.eclipse.paho.mqttv5.client.test</groupId>
1310
<artifactId>org.eclipse.paho.mqttv5.client.test</artifactId>
1411
<version>1.2.5</version>
15-
<name>org.eclipse.paho.mqttv5.client.test</name>
16-
17-
<url>http://maven.apache.org</url>
18-
19-
<properties>
20-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
21-
</properties>
12+
<packaging>jar</packaging>
2213

23-
<dependencies>
24-
<dependency>
25-
<groupId>junit</groupId>
26-
<artifactId>junit</artifactId>
27-
<version>3.8.1</version>
28-
<scope>test</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.eclipse.paho</groupId>
32-
<artifactId>org.eclipse.paho.mqttv5.client</artifactId>
33-
<version>1.2.5</version>
34-
</dependency>
35-
</dependencies>
36-
3714
<build>
3815
<plugins>
3916
<plugin>
40-
<groupId>org.jacoco</groupId>
41-
<artifactId>jacoco-maven-plugin</artifactId>
42-
<version>${jacoco.version}</version>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-compiler-plugin</artifactId>
19+
</plugin>
20+
21+
<plugin>
22+
<groupId>org.apache.maven.plugins</groupId>
23+
<artifactId>maven-source-plugin</artifactId>
24+
<version>2.2.1</version>
4325
<executions>
4426
<execution>
27+
<id>attach-sources</id>
4528
<goals>
46-
<goal>prepare-agent</goal>
29+
<goal>test-jar-no-fork</goal>
4730
</goals>
4831
</execution>
32+
</executions>
33+
</plugin>
34+
<plugin>
35+
<groupId>org.apache.maven.plugins</groupId>
36+
<artifactId>maven-jar-plugin</artifactId>
37+
<version>2.4</version>
38+
<executions>
4939
<execution>
50-
<id>generate-test-report</id>
51-
<phase>test</phase>
5240
<goals>
53-
<goal>report-aggregate</goal>
41+
<goal>test-jar</goal>
5442
</goals>
5543
</execution>
5644
</executions>
5745
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-surefire-plugin</artifactId>
49+
<version>2.15</version>
50+
<configuration>
51+
<systemPropertyVariables>
52+
<SERVER_URI>${test.server_uri}</SERVER_URI>
53+
<SERVER_SSL_PORT>${test.server_ssl_port}</SERVER_SSL_PORT>
54+
<SERVER_WEBSOCKET_URI>${test.server_websocket_uri}</SERVER_WEBSOCKET_URI>
55+
</systemPropertyVariables>
56+
<excludes>
57+
<exclude>${test.exclude}</exclude>
58+
</excludes>
59+
<runOrder>alphabetical</runOrder>
60+
<reuseForks>false</reuseForks>
61+
<forkCount>1</forkCount>
62+
</configuration>
63+
</plugin>
64+
<plugin>
65+
<groupId>org.jacoco</groupId>
66+
<artifactId>jacoco-maven-plugin</artifactId>
67+
<version>${jacoco.version}</version>
68+
<executions>
69+
<execution>
70+
<goals>
71+
<goal>prepare-agent</goal>
72+
</goals>
73+
</execution>
74+
<execution>
75+
<id>generate-test-report</id>
76+
<phase>test</phase>
77+
<goals>
78+
<goal>report-aggregate</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
5883
</plugins>
5984
</build>
60-
61-
<packaging>pom</packaging>
85+
86+
<dependencies>
87+
<dependency>
88+
<groupId>org.eclipse.paho</groupId>
89+
<artifactId>org.eclipse.paho.mqttv5.client</artifactId>
90+
<version>1.2.5</version>
91+
</dependency>
92+
93+
<dependency>
94+
<groupId>junit</groupId>
95+
<artifactId>junit</artifactId>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>javax.xml.bind</groupId>
100+
<artifactId>jaxb-api</artifactId>
101+
<version>2.3.1</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.glassfish.jaxb</groupId>
105+
<artifactId>jaxb-runtime</artifactId>
106+
<version>2.3.1</version>
107+
<scope>runtime</scope>
108+
</dependency>
109+
</dependencies>
62110
</project>
63111

‎org.eclipse.paho.mqttv5.client.test/src/main/java/org/org/eclipse/paho/mqttv5/client/test/App.java‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/internal/NetworkModuleServiceTest.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/internal/NetworkModuleServiceTest.java

File renamed without changes.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/BasicSSLTest.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/test/BasicSSLTest.java

File renamed without changes.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/BasicTest.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/test/BasicTest.java

File renamed without changes.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/ClientIdTest.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/test/ClientIdTest.java

File renamed without changes.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/PersistenceTests.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/test/PersistenceTests.java

File renamed without changes.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/PublishTests.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/test/PublishTests.java

File renamed without changes.

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/SendReceiveAsyncTest.java renamed to org.eclipse.paho.mqttv5.client.test/src/test/java/org/eclipse/paho/mqttv5/client/test/SendReceiveAsyncTest.java

File renamed without changes.

0 commit comments

Comments
 (0)