SurefireArchiver didn't recognize failsafe:integration-test goal [JEN…

…KINS-16696] Originally-Committed-As: 954a368c5612b7d7e7619277aca420c7c4930517
jenkinsci · Feb 11, 2013 · f4e8241 · f4e8241
1 parent 9fd0363
commit f4e8241
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/hudson/maven/reporters/TestMojo.java b/src/main/java/hudson/maven/reporters/TestMojo.java
@@ -36,7 +36,8 @@ protected boolean is(String artifactId, String groupId, String goal) {
     },
 
     MAVEN_SUREFIRE("org.apache.maven.plugins", "maven-surefire-plugin","test","reportsDirectory"),
-    MAVEN_FAILSAFE("org.apache.maven.plugins", "maven-failsafe-plugin", "verify","reportsDirectory"),
+    MAVEN_FAILSAFE("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test","reportsDirectory"),
+    MAVEN_FAILSAFE_B("org.apache.maven.plugins", "maven-failsafe-plugin", "verify","reportsDirectory"),
 
     MAVEN_JUNIT("com.sun.maven", "maven-junit-plugin", "test","reportsDirectory"),
     FLEXMOJOS("org.sonatype.flexmojos", "flexmojos-maven-plugin", "test-run",null),
@@ -159,7 +160,7 @@ public static TestMojo lookup(String artifactId, String groupId, String goal) {
             }
         }
 
-        if (goal.equals("test") || goal.equals("test-run")) {
+        if (goal.equals("test") || goal.equals("test-run") || goal.equals("integration-test")) {
             return FALLBACK;
         }
 

diff --git a/src/test/java/hudson/maven/reporters/SurefireArchiverDetectTestMojosTest.java b/src/test/java/hudson/maven/reporters/SurefireArchiverDetectTestMojosTest.java
@@ -35,6 +35,12 @@ public void shouldDetectMavenFailsafe() {
         assertTrue(this.surefireArchiver.isTestMojo(mojo));
     }
 
+    @Test
+    public void shouldDetectMavenFailsafe2() {
+        MojoInfo mojo = mojoBuilder("org.apache.maven.plugins", "maven-failsafe-plugin", "integration-test").build();
+        assertTrue(this.surefireArchiver.isTestMojo(mojo));
+    }
+
     @Test
     public void shouldDetectMavenSurefireSkip() {
         MojoInfoBuilder builder = mojoBuilder("org.apache.maven.plugins", "maven-surefire-plugin", "test");