Skip to content

Commit ae3e017

Browse files
hgschmiehgschmie
committed
Update integration tests to run fast
1 parent 8853040 commit ae3e017

File tree

24 files changed

+203
-175
lines changed

24 files changed

+203
-175
lines changed

‎pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,6 @@
122122
</execution>
123123
</executions>
124124
</plugin>
125-
<plugin>
126-
<groupId>org.apache.maven.plugins</groupId>
127-
<artifactId>maven-invoker-plugin</artifactId>
128-
<configuration>
129-
<parallelThreads>1</parallelThreads>
130-
</configuration>
131-
</plugin>
132125
</plugins>
133126
</build>
134127

‎src/it/001-simple/pom.xml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,20 @@
33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>test</groupId>
7-
<artifactId>testapp</artifactId>
8-
<version>1.0</version>
96

10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<maven.compiler.source>1.8</maven.compiler.source>
13-
<maven.compiler.target>1.8</maven.compiler.target>
14-
</properties>
7+
<parent>
8+
<groupId>org.skife.maven</groupId>
9+
<artifactId>test-parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>test-001</artifactId>
1514

1615
<build>
1716
<plugins>
1817
<plugin>
1918
<groupId>org.apache.maven.plugins</groupId>
2019
<artifactId>maven-jar-plugin</artifactId>
21-
<configuration>
22-
<archive>
23-
<manifest>
24-
<mainClass>App</mainClass>
25-
</manifest>
26-
</archive>
27-
</configuration>
2820
</plugin>
2921

3022
<plugin>
@@ -42,5 +34,4 @@
4234
</plugin>
4335
</plugins>
4436
</build>
45-
4637
</project>

‎src/it/001-simple/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
File jar = new File(new File(basedir, "target"), 'testapp-1.0.jar')
1+
File jar = new File(new File(basedir, "target"), 'test-001-1.0-SNAPSHOT.jar')
22
assert jar.exists()
33
result = jar.toString().execute().text
44
assert result.contains("Hello world!")

‎src/it/002-withScriptFile/pom.xml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,20 @@
33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>test</groupId>
7-
<artifactId>testapp</artifactId>
8-
<version>1.0</version>
96

10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<maven.compiler.source>1.8</maven.compiler.source>
13-
<maven.compiler.target>1.8</maven.compiler.target>
14-
</properties>
7+
<parent>
8+
<groupId>org.skife.maven</groupId>
9+
<artifactId>test-parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>test-002</artifactId>
1514

1615
<build>
1716
<plugins>
1817
<plugin>
1918
<groupId>org.apache.maven.plugins</groupId>
2019
<artifactId>maven-jar-plugin</artifactId>
21-
<configuration>
22-
<archive>
23-
<manifest>
24-
<mainClass>App</mainClass>
25-
</manifest>
26-
</archive>
27-
</configuration>
2820
</plugin>
2921

3022
<plugin>
@@ -45,5 +37,4 @@
4537
</plugin>
4638
</plugins>
4739
</build>
48-
4940
</project>

‎src/it/002-withScriptFile/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
File jar = new File(new File(basedir, "target"), 'testapp-1.0.jar')
1+
File jar = new File(new File(basedir, "target"), 'test-002-1.0-SNAPSHOT.jar')
22
assert jar.exists()
33
result = jar.toString().execute().text
44
assert result.contains("Fake news!")

‎src/it/003-withFlags/pom.xml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,20 @@
33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>test</groupId>
7-
<artifactId>testapp</artifactId>
8-
<version>1.0</version>
96

10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<maven.compiler.source>1.8</maven.compiler.source>
13-
<maven.compiler.target>1.8</maven.compiler.target>
14-
</properties>
7+
<parent>
8+
<groupId>org.skife.maven</groupId>
9+
<artifactId>test-parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>test-003</artifactId>
1514

1615
<build>
1716
<plugins>
1817
<plugin>
1918
<groupId>org.apache.maven.plugins</groupId>
2019
<artifactId>maven-jar-plugin</artifactId>
21-
<configuration>
22-
<archive>
23-
<manifest>
24-
<mainClass>App</mainClass>
25-
</manifest>
26-
</archive>
27-
</configuration>
2820
</plugin>
2921

3022
<plugin>

‎src/it/003-withFlags/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
File jar = new File(new File(basedir, "target"), 'testapp-1.0.jar')
1+
File jar = new File(new File(basedir, "target"), 'test-003-1.0-SNAPSHOT.jar')
22
assert jar.exists()
33
result = jar.toString().execute().text
44
assert result.contains("Salut world!")

‎src/it/004-withClassifier/pom.xml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,20 @@
33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>test</groupId>
7-
<artifactId>testapp</artifactId>
8-
<version>1.0</version>
96

10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<maven.compiler.source>1.8</maven.compiler.source>
13-
<maven.compiler.target>1.8</maven.compiler.target>
14-
</properties>
7+
<parent>
8+
<groupId>org.skife.maven</groupId>
9+
<artifactId>test-parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>test-004</artifactId>
1514

1615
<build>
1716
<plugins>
1817
<plugin>
1918
<groupId>org.apache.maven.plugins</groupId>
2019
<artifactId>maven-jar-plugin</artifactId>
21-
<configuration>
22-
<archive>
23-
<manifest>
24-
<mainClass>App</mainClass>
25-
</manifest>
26-
</archive>
27-
</configuration>
2820
<executions>
2921
<execution>
3022
<phase>package</phase>

‎src/it/004-withClassifier/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
File jar = new File(new File(basedir, "target"), 'testapp-1.0.jar')
1+
File jar = new File(new File(basedir, "target"), 'test-004-1.0-SNAPSHOT.jar')
22
assert jar.exists()
33
try {
44
result = jar.toString().execute().text
55
throw new AssertionError("this should not have worked!")
66
} catch (IOException ignored) {
77
}
88

9-
File jar2 = new File(new File(basedir, "target"), 'testapp-1.0-secondary.jar')
9+
File jar2 = new File(new File(basedir, "target"), 'test-004-1.0-SNAPSHOT-secondary.jar')
1010
assert jar2.exists()
1111
result = jar2.toString().execute().text
1212
assert result.contains("Hello world!")

‎src/it/005-withInputFile/pom.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,20 @@
33
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>test</groupId>
7-
<artifactId>testapp</artifactId>
8-
<version>1.0</version>
96

10-
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
12-
<maven.compiler.source>1.8</maven.compiler.source>
13-
<maven.compiler.target>1.8</maven.compiler.target>
14-
</properties>
7+
<parent>
8+
<groupId>org.skife.maven</groupId>
9+
<artifactId>test-parent</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>test-005</artifactId>
1514

1615
<build>
1716
<plugins>
1817
<plugin>
1918
<groupId>org.apache.maven.plugins</groupId>
2019
<artifactId>maven-jar-plugin</artifactId>
21-
<configuration>
22-
<archive>
23-
<manifest>
24-
<mainClass>App</mainClass>
25-
</manifest>
26-
</archive>
27-
</configuration>
2820
<executions>
2921
<execution>
3022
<phase>package</phase>
@@ -43,7 +35,7 @@
4335
<artifactId>@project.artifactId@</artifactId>
4436
<version>@project.version@</version>
4537
<configuration>
46-
<inputFile>target/testapp-1.0-secondary.jar</inputFile>
38+
<inputFile>target/test-005-1.0-SNAPSHOT-secondary.jar</inputFile>
4739
</configuration>
4840
<executions>
4941
<execution>

0 commit comments

Comments
 (0)