Skip to content

Commit bfc6908

Browse files
deivid-rodriguezdeivid-rodriguez
committed
Fix runit plugin tests
1 parent ae72c00 commit bfc6908

File tree

9 files changed

+104
-23
lines changed

9 files changed

+104
-23
lines changed

‎minitest-maven-plugin/src/it/minispec-with-jar-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<dependency>
2020
<groupId>rubygems</groupId>
21-
<artifactId>leafy-complete</artifactId>
21+
<artifactId>leafy-metrics</artifactId>
2222
<version>0.6.2</version>
2323
<type>gem</type>
2424
</dependency>

‎runit-maven-plugin/src/it/runit-failure/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
<groupId>de.saumya.mojo</groupId>
55
<artifactId>runit-failure</artifactId>
66
<version>testing</version>
7-
7+
8+
<repositories>
9+
<repository>
10+
<id>rubygems-releases</id>
11+
<url>http://rubygems-proxy.torquebox.org/releases</url>
12+
</repository>
13+
</repositories>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>rubygems</groupId>
18+
<artifactId>test-unit</artifactId>
19+
<version>3.4.4</version>
20+
<type>gem</type>
21+
<scope>test</scope>
22+
</dependency>
23+
</dependencies>
24+
825
<build>
926
<plugins>
1027
<plugin>

‎runit-maven-plugin/src/it/runit-pom/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
<groupId>de.saumya.mojo</groupId>
55
<artifactId>runit-pom</artifactId>
66
<version>testing</version>
7-
7+
8+
<repositories>
9+
<repository>
10+
<id>rubygems-releases</id>
11+
<url>http://rubygems-proxy.torquebox.org/releases</url>
12+
</repository>
13+
</repositories>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>rubygems</groupId>
18+
<artifactId>test-unit</artifactId>
19+
<version>3.4.4</version>
20+
<type>gem</type>
21+
<scope>test</scope>
22+
</dependency>
23+
</dependencies>
24+
825
<build>
926
<plugins>
1027
<plugin>

‎runit-maven-plugin/src/it/runit-somewhere/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
<groupId>de.saumya.mojo</groupId>
55
<artifactId>runit-somewhere</artifactId>
66
<version>testing</version>
7-
7+
8+
<repositories>
9+
<repository>
10+
<id>rubygems-releases</id>
11+
<url>http://rubygems-proxy.torquebox.org/releases</url>
12+
</repository>
13+
</repositories>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>rubygems</groupId>
18+
<artifactId>test-unit</artifactId>
19+
<version>3.4.4</version>
20+
<type>gem</type>
21+
<scope>test</scope>
22+
</dependency>
23+
</dependencies>
24+
825
<build>
926
<plugins>
1027
<plugin>

‎runit-maven-plugin/src/it/runit-summary-report/pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
<groupId>de.saumya.mojo</groupId>
55
<artifactId>runit-pom</artifactId>
66
<version>testing</version>
7-
7+
8+
<repositories>
9+
<repository>
10+
<id>rubygems-releases</id>
11+
<url>http://rubygems-proxy.torquebox.org/releases</url>
12+
</repository>
13+
</repositories>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>rubygems</groupId>
18+
<artifactId>test-unit</artifactId>
19+
<version>3.4.4</version>
20+
<type>gem</type>
21+
<scope>test</scope>
22+
</dependency>
23+
</dependencies>
24+
825
<build>
926
<plugins>
1027
<plugin>

‎runit-maven-plugin/src/it/runit-with-env/pom.xml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,24 @@
44
<groupId>de.saumya.mojo</groupId>
55
<artifactId>runit-pom</artifactId>
66
<version>testing</version>
7-
7+
8+
<repositories>
9+
<repository>
10+
<id>rubygems-releases</id>
11+
<url>http://rubygems-proxy.torquebox.org/releases</url>
12+
</repository>
13+
</repositories>
14+
15+
<dependencies>
16+
<dependency>
17+
<groupId>rubygems</groupId>
18+
<artifactId>test-unit</artifactId>
19+
<version>3.4.4</version>
20+
<type>gem</type>
21+
<scope>test</scope>
22+
</dependency>
23+
</dependencies>
24+
825
<build>
926
<plugins>
1027
<plugin>
@@ -13,7 +30,7 @@
1330
<version>@project.version@</version>
1431
<configuration>
1532
<env><VERSION>123</VERSION></env>
16-
<versions>1.7.8,1.7.13</versions>
33+
<versions>9.2.18.0</versions>
1734
</configuration>
1835
<executions>
1936
<execution>

‎runit-maven-plugin/src/it/runit-with-env/verify.bsh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ if ( !log.contains( expected ) )
88
throw new RuntimeException( "log file does not contain '" + expected + "'" );
99
}
1010

11-
File file = new File( basedir, "target/surefire-reports/TEST-runit-1.7.8--1.9.xml");
12-
if ( !file.exists() )
13-
{
14-
throw new RuntimeException( "file does not exist: '" + file.getAbsolutePath() + "'" );
15-
}
16-
file = new File( basedir, "target/surefire-reports/TEST-runit-1.7.13--1.9.xml");
11+
File file = new File( basedir, "target/surefire-reports/TEST-runit.xml");
1712
if ( !file.exists() )
1813
{
1914
throw new RuntimeException( "file does not exist: '" + file.getAbsolutePath() + "'" );

‎runit-maven-plugin/src/it/runit-with-jar-dependencies/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,17 @@
1313
</repositories>
1414

1515
<dependencies>
16-
1716
<dependency>
1817
<groupId>rubygems</groupId>
19-
<artifactId>leafy-complete</artifactId>
18+
<artifactId>test-unit</artifactId>
19+
<version>3.4.4</version>
20+
<type>gem</type>
21+
<scope>test</scope>
22+
</dependency>
23+
24+
<dependency>
25+
<groupId>rubygems</groupId>
26+
<artifactId>leafy-metrics</artifactId>
2027
<version>0.6.2</version>
2128
<type>gem</type>
2229
</dependency>

‎runit-maven-plugin/src/it/runit-with-jar-dependencies/verify.bsh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.codehaus.plexus.util.FileUtils;
33

44

55
String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
6-
String expected = "1 tests, 1 assertions, 0 failures, 0 errors, 0 skips";
6+
String expected = "1 tests, 1 assertions, 0 failures, 0 errors, 0 pendings";
77
if ( !log.contains( expected ) )
88
{
99
throw new RuntimeException( "log file does not contain '" + expected + "'" );
@@ -15,13 +15,7 @@ if ( !log.contains( expected ) )
1515
throw new RuntimeException( "log file does not contain '" + expected + "'" );
1616
}
1717

18-
File f = new File( new File( new File( basedir, "target" ), "surefire-reports" ), "TEST-runit-9.0.1.0.xml" );
19-
if ( !f.exists() )
20-
{
21-
throw new RuntimeException( "file does not exist: " + f );
22-
}
23-
24-
f = new File( new File( new File( basedir, "target" ), "surefire-reports" ), "TEST-runit-1.7.22--1.9.xml" );
18+
File f = new File( new File( new File( basedir, "target" ), "surefire-reports"), "TEST-runit.xml" );
2519
if ( !f.exists() )
2620
{
2721
throw new RuntimeException( "file does not exist: " + f );

0 commit comments

Comments
 (0)