You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/05/28 23:23:11 UTC
[1/4] maven-surefire git commit: SUREFIRE-1153 Take includes into
account when using test/it.test property
Repository: maven-surefire
Updated Branches:
refs/heads/master 205aba6f7 -> 45069148e
SUREFIRE-1153 Take includes into account when using test/it.test property
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/c0816662
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/c0816662
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/c0816662
Branch: refs/heads/master
Commit: c0816662367e54d2431ffdbb6b58d3cb417245bc
Parents: 205aba6
Author: Tomas Rohovsky <tr...@redhat.com>
Authored: Fri Apr 10 21:49:01 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu May 28 22:46:59 2015 +0200
----------------------------------------------------------------------
.../plugin/surefire/AbstractSurefireMojo.java | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/c0816662/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 46256d3..6287969 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1634,39 +1634,39 @@ public abstract class AbstractSurefireMojo
private List<String> getIncludeList()
throws MojoFailureException
{
- List<String> includes = null;
+ List<String> actualIncludes = null;
if ( isSpecificTestSpecified() && !isMultipleExecutionBlocksDetected() )
{
- includes = Collections.singletonList( getTest() );
+ actualIncludes = Collections.singletonList( "**/*" );
}
else
{
if ( getIncludesFile() != null )
{
- includes = readListFromFile( getIncludesFile() );
+ actualIncludes = readListFromFile( getIncludesFile() );
}
// If we have includesFile, and we have includes, then append includes to includesFile content
- if ( includes == null )
+ if ( actualIncludes == null )
{
- includes = getIncludes();
+ actualIncludes = getIncludes();
}
else
{
- maybeAppendList( includes, getIncludes() );
+ maybeAppendList( actualIncludes, getIncludes() );
}
- checkMethodFilterInIncludesExcludes( includes );
- }
+ checkMethodFilterInIncludesExcludes( actualIncludes );
- // defaults here, qdox doesn't like the end javadoc value
- // Have to wrap in an ArrayList as surefire expects an ArrayList instead of a List for some reason
- if ( includes == null || includes.isEmpty() )
- {
- includes = Arrays.asList( getDefaultIncludes() );
+ // defaults here, qdox doesn't like the end javadoc value
+ // Have to wrap in an ArrayList as surefire expects an ArrayList instead of a List for some reason
+ if ( actualIncludes == null || actualIncludes.isEmpty() )
+ {
+ actualIncludes = Arrays.asList( getDefaultIncludes() );
+ }
}
- return filterNulls( includes );
+ return filterNulls( actualIncludes );
}
private void checkMethodFilterInIncludesExcludes( Iterable<String> patterns )
[2/4] maven-surefire git commit: SUREFIRE-1153 Integration test
Posted by ti...@apache.org.
SUREFIRE-1153 Integration test
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7ffd542b
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7ffd542b
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7ffd542b
Branch: refs/heads/master
Commit: 7ffd542bcb8b4a85da9dfedbf8977ebee5f4edac
Parents: c081666
Author: Tomas Rohovsky <tr...@redhat.com>
Authored: Sat May 16 15:29:04 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu May 28 22:47:00 2015 +0200
----------------------------------------------------------------------
.../Surefire1153IncludesAndSpecifiedTestIT.java | 40 +++++++++++++
.../pom.xml | 63 ++++++++++++++++++++
.../java/jiras/surefire1153/IncludedUT.java | 30 ++++++++++
.../jiras/surefire1153/NotIncludedTest.java | 30 ++++++++++
4 files changed, 163 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7ffd542b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
new file mode 100644
index 0000000..6f42458
--- /dev/null
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
@@ -0,0 +1,40 @@
+package org.apache.maven.surefire.its.jiras;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+
+import org.junit.Test;
+
+public class Surefire1153IncludesAndSpecifiedTestIT
+ extends SurefireJUnit4IntegrationTestCase
+{
+
+ @Test
+ public void testSpecifiedTestInIncludes()
+ {
+ unpack( "/surefire-1153-includesAndSpecifiedTest" ).setTestToRun( "#testIncluded" ).executeTest().verifyErrorFree( 1 );
+ }
+
+ @Test
+ public void testSpecifiedTestNotInIncludes()
+ {
+ unpack( "/surefire-1153-includesAndSpecifiedTest" ).setTestToRun( "#testNotIncluded" ).executeTest().verifyErrorFree( 1 );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7ffd542b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
new file mode 100644
index 0000000..0f88caa
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>jiras-surefire-1153</artifactId>
+ <version>1.0</version>
+ <url>http://maven.apache.org</url>
+ <properties>
+ <version.junit>4.12</version.junit>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*UT.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7ffd542b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
new file mode 100644
index 0000000..042cf37
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/IncludedUT.java
@@ -0,0 +1,30 @@
+package jiras.surefire1153;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.junit.Test;
+
+public class IncludedUT
+{
+ @Test
+ public void testIncluded()
+ {
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7ffd542b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
new file mode 100644
index 0000000..b03d0af
--- /dev/null
+++ b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/src/test/java/jiras/surefire1153/NotIncludedTest.java
@@ -0,0 +1,30 @@
+package jiras.surefire1153;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.junit.Test;
+
+public class NotIncludedTest
+{
+ @Test
+ public void testNotIncluded()
+ {
+ }
+}
[4/4] maven-surefire git commit: [SUREFIRE-1153] getTest() != NULL ->
StringUtils.isNotBlank( getTest() )
Posted by ti...@apache.org.
[SUREFIRE-1153] getTest() != NULL -> StringUtils.isNotBlank( getTest() )
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/45069148
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/45069148
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/45069148
Branch: refs/heads/master
Commit: 45069148e8d41746425b0f35cdd6767ffebe3dad
Parents: 1edb3c1
Author: Tibor17 <ti...@lycos.com>
Authored: Thu May 28 21:51:43 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu May 28 22:47:01 2015 +0200
----------------------------------------------------------------------
.../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/45069148/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 6a8a309..014f1a8 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1540,7 +1540,7 @@ public abstract class AbstractSurefireMojo
private boolean isSpecificTestSpecified()
{
- return getTest() != null;
+ return StringUtils.isNotBlank( getTest() );
}
private boolean isValidSuiteXmlFileConfig()
[3/4] maven-surefire git commit: [SUREFIRE-1153] Take includes into
account when using test/it.test property
Posted by ti...@apache.org.
[SUREFIRE-1153] Take includes into account when using test/it.test property
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/1edb3c12
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/1edb3c12
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/1edb3c12
Branch: refs/heads/master
Commit: 1edb3c12653dba5705edbc6529534e9a2ec22f15
Parents: 7ffd542
Author: Tibor17 <ti...@lycos.com>
Authored: Wed May 20 00:41:36 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu May 28 22:47:00 2015 +0200
----------------------------------------------------------------------
.../plugin/surefire/AbstractSurefireMojo.java | 41 ++++++--------------
.../Surefire1153IncludesAndSpecifiedTestIT.java | 10 ++++-
.../Surefire806SpecifiedTestControlsIT.java | 3 ++
.../pom.xml | 16 +++++---
4 files changed, 32 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1edb3c12/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 6287969..6a8a309 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -54,8 +53,6 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -1634,39 +1631,39 @@ public abstract class AbstractSurefireMojo
private List<String> getIncludeList()
throws MojoFailureException
{
- List<String> actualIncludes = null;
- if ( isSpecificTestSpecified() && !isMultipleExecutionBlocksDetected() )
+ List<String> includes = null;
+ if ( isSpecificTestSpecified() )
{
- actualIncludes = Collections.singletonList( "**/*" );
+ includes = Collections.singletonList( getTest() );
}
else
{
if ( getIncludesFile() != null )
{
- actualIncludes = readListFromFile( getIncludesFile() );
+ includes = readListFromFile( getIncludesFile() );
}
// If we have includesFile, and we have includes, then append includes to includesFile content
- if ( actualIncludes == null )
+ if ( includes == null )
{
- actualIncludes = getIncludes();
+ includes = getIncludes();
}
else
{
- maybeAppendList( actualIncludes, getIncludes() );
+ maybeAppendList( includes, getIncludes() );
}
- checkMethodFilterInIncludesExcludes( actualIncludes );
+ checkMethodFilterInIncludesExcludes( includes );
// defaults here, qdox doesn't like the end javadoc value
// Have to wrap in an ArrayList as surefire expects an ArrayList instead of a List for some reason
- if ( actualIncludes == null || actualIncludes.isEmpty() )
+ if ( includes == null || includes.isEmpty() )
{
- actualIncludes = Arrays.asList( getDefaultIncludes() );
+ includes = Arrays.asList( getDefaultIncludes() );
}
}
- return filterNulls( actualIncludes );
+ return filterNulls( includes );
}
private void checkMethodFilterInIncludesExcludes( Iterable<String> patterns )
@@ -1720,22 +1717,6 @@ public abstract class AbstractSurefireMojo
return result;
}
- private boolean isMultipleExecutionBlocksDetected()
- {
- MavenProject project = getProject();
- if ( project != null )
- {
- String key = getPluginDescriptor().getPluginLookupKey();
- Plugin plugin = (Plugin) project.getBuild().getPluginsAsMap().get( key );
- if ( plugin != null )
- {
- Collection<PluginExecution> executions = plugin.getExecutions();
- return executions != null && executions.size() > 1;
- }
- }
- return false;
- }
-
private Artifact getTestNgArtifact()
throws MojoExecutionException
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1edb3c12/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
index 6f42458..3a2c826 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1153IncludesAndSpecifiedTestIT.java
@@ -29,12 +29,18 @@ public class Surefire1153IncludesAndSpecifiedTestIT
@Test
public void testSpecifiedTestInIncludes()
{
- unpack( "/surefire-1153-includesAndSpecifiedTest" ).setTestToRun( "#testIncluded" ).executeTest().verifyErrorFree( 1 );
+ unpack( "/surefire-1153-includesAndSpecifiedTest" )
+ .setTestToRun( "#testIncluded" )
+ .executeTest()
+ .verifyErrorFree( 1 );
}
@Test
public void testSpecifiedTestNotInIncludes()
{
- unpack( "/surefire-1153-includesAndSpecifiedTest" ).setTestToRun( "#testNotIncluded" ).executeTest().verifyErrorFree( 1 );
+ unpack( "/surefire-1153-includesAndSpecifiedTest" )
+ .setTestToRun( "#testNotIncluded" )
+ .executeTest()
+ .verifyErrorFree( 1 );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1edb3c12/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
index d6a96c0..70e4d63 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire806SpecifiedTestControlsIT.java
@@ -21,6 +21,7 @@ package org.apache.maven.surefire.its.jiras;
import org.apache.maven.surefire.its.Not2xCompatible;
import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -30,6 +31,7 @@ public class Surefire806SpecifiedTestControlsIT
{
@Test
+ @Ignore( "since SUREFIRE-1153 the includes/excludes are overridden by -Dtest or it.test for whatever execution" )
public void singleTestInOneExecutionOfMultiExecutionProject()
{
unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun( "FirstTest" ).failIfNoSpecifiedTests(
@@ -37,6 +39,7 @@ public class Surefire806SpecifiedTestControlsIT
}
@Test
+ @Ignore( "since SUREFIRE-1153 the includes/excludes are overridden by -Dtest or it.test for whatever execution" )
public void twoSpecifiedTestExecutionsInCorrectExecutionBlocks()
{
unpack( "/surefire-806-specifiedTests-multi" ).setTestToRun(
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/1edb3c12/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
index 0f88caa..b8b4a03 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1153-includesAndSpecifiedTest/pom.xml
@@ -17,27 +17,24 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.apache.maven.surefire</groupId>
<artifactId>it-parent</artifactId>
<version>1.0</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>jiras-surefire-1153</artifactId>
<version>1.0</version>
<url>http://maven.apache.org</url>
- <properties>
- <version.junit>4.12</version.junit>
- </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${version.junit}</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -57,6 +54,13 @@
<include>**/*UT.java</include>
</includes>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>