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 2022/03/14 22:24:38 UTC
[maven-surefire] 01/02: Revert "[SUREFIRE-1964] Support for method filtering on excludesFile and includesFile"
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch SUREFIRE-1964
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 96d4eef46826f8db860401c84012c6d8009e3963
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon Mar 14 21:58:40 2022 +0100
Revert "[SUREFIRE-1964] Support for method filtering on excludesFile and includesFile"
This reverts commit 342ff2b10ad7b9ff29748c7b44a042652fae1eb6.
---
.../plugin/surefire/AbstractSurefireMojo.java | 120 +++++--------
.../plugin/surefire/AbstractSurefireMojoTest.java | 198 ++-------------------
.../maven/plugin/surefire/MojoMocklessTest.java | 6 -
.../maven/plugin/surefire/SurefirePlugin.java | 12 --
.../its/AbstractTestMultipleMethodPatterns.java | 3 +-
.../maven/surefire/its/jiras/Surefire1964IT.java | 55 ------
.../test/resources/surefire-1964/exclusions.txt | 1 -
.../test/resources/surefire-1964/inclusions.txt | 1 -
.../src/test/resources/surefire-1964/pom.xml | 58 ------
.../src/test/java/pkg/ExcludedTest.java | 12 --
.../src/test/java/pkg/FilterTest.java | 24 ---
11 files changed, 58 insertions(+), 432 deletions(-)
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 40ed199..c9f44b5 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
@@ -2194,110 +2194,78 @@ public abstract class AbstractSurefireMojo
}
}
- @Nonnull
- private List<String> getExcludedScanList()
- throws MojoFailureException
+ private void maybeAppendList( List<String> base, List<String> list )
{
- return getExcludeList( true );
- }
-
- @Nonnull
- private List<String> getExcludeList()
- throws MojoFailureException
- {
- return getExcludeList( false );
+ if ( list != null )
+ {
+ base.addAll( list );
+ }
}
- /**
- * Computes a merge list of test exclusions.
- * Used only in {@link #getExcludeList()} and {@link #getExcludedScanList()}.
- * @param asScanList true if dependency or directory scanner
- * @return list of patterns
- * @throws MojoFailureException if the excludes breaks a pattern format
- */
- @Nonnull
- private List<String> getExcludeList( boolean asScanList )
+ @Nonnull private List<String> getExcludeList()
throws MojoFailureException
{
- List<String> excludes;
+ List<String> actualExcludes = null;
if ( isSpecificTestSpecified() )
{
- excludes = Collections.emptyList();
+ actualExcludes = Collections.emptyList();
}
else
{
- excludes = new ArrayList<>();
- if ( asScanList )
+ if ( getExcludesFile() != null )
{
- if ( getExcludes() != null )
- {
- excludes.addAll( getExcludes() );
- }
- checkMethodFilterInIncludesExcludes( excludes );
+ actualExcludes = readListFromFile( getExcludesFile() );
}
- if ( getExcludesFile() != null )
+ if ( actualExcludes == null )
{
- excludes.addAll( readListFromFile( getExcludesFile() ) );
+ actualExcludes = getExcludes();
}
+ else
+ {
+ maybeAppendList( actualExcludes, getExcludes() );
+ }
+
+ checkMethodFilterInIncludesExcludes( actualExcludes );
- if ( asScanList && excludes.isEmpty() )
+ if ( actualExcludes == null || actualExcludes.isEmpty() )
{
- excludes = Collections.singletonList( getDefaultExcludes() );
+ actualExcludes = Collections.singletonList( getDefaultExcludes() );
}
}
- return filterNulls( excludes );
- }
-
- @Nonnull
- private List<String> getIncludedScanList()
- throws MojoFailureException
- {
- return getIncludeList( true );
+ return filterNulls( actualExcludes );
}
- @Nonnull
private List<String> getIncludeList()
throws MojoFailureException
{
- return getIncludeList( false );
- }
-
- /**
- * Computes a merge list of test inclusions.
- * Used only in {@link #getIncludeList()} and {@link #getIncludedScanList()}.
- * @param asScanList true if dependency or directory scanner
- * @return list of patterns
- * @throws MojoFailureException if the includes breaks a pattern format
- */
- @Nonnull
- private List<String> getIncludeList( boolean asScanList )
- throws MojoFailureException
- {
- final List<String> includes = new ArrayList<>();
+ List<String> includes = null;
if ( isSpecificTestSpecified() )
{
+ includes = new ArrayList<>();
addAll( includes, split( getTest(), "," ) );
}
else
{
- if ( asScanList )
+ if ( getIncludesFile() != null )
{
- if ( getIncludes() != null )
- {
- includes.addAll( getIncludes() );
- }
- checkMethodFilterInIncludesExcludes( includes );
+ includes = readListFromFile( getIncludesFile() );
}
- if ( getIncludesFile() != null )
+ if ( includes == null )
{
- includes.addAll( readListFromFile( getIncludesFile() ) );
+ includes = getIncludes();
}
+ else
+ {
+ maybeAppendList( includes, getIncludes() );
+ }
+
+ checkMethodFilterInIncludesExcludes( includes );
- if ( asScanList && includes.isEmpty() )
+ if ( includes == null || includes.isEmpty() )
{
- addAll( includes, getDefaultIncludes() );
+ includes = asList( getDefaultIncludes() );
}
}
@@ -2307,12 +2275,16 @@ public abstract class AbstractSurefireMojo
private void checkMethodFilterInIncludesExcludes( Iterable<String> patterns )
throws MojoFailureException
{
- for ( String pattern : patterns )
+ if ( patterns != null )
{
- if ( pattern != null && pattern.contains( "#" ) )
+ for ( String pattern : patterns )
{
- throw new MojoFailureException( "Method filter prohibited in includes|excludes parameter: "
- + pattern );
+ if ( pattern != null && pattern.contains( "#" ) )
+ {
+ throw new MojoFailureException( "Method filter prohibited in "
+ + "includes|excludes|includesFile|excludesFile parameter: "
+ + pattern );
+ }
}
}
}
@@ -2322,18 +2294,16 @@ public abstract class AbstractSurefireMojo
{
if ( includedExcludedTests == null )
{
- includedExcludedTests = new TestListResolver( getIncludedScanList(), getExcludedScanList() );
- getConsoleLogger().debug( "Resolved included and excluded patterns: " + includedExcludedTests );
+ includedExcludedTests = new TestListResolver( getIncludeList(), getExcludeList() );
}
return includedExcludedTests;
}
public TestListResolver getSpecificTests()
- throws MojoFailureException
{
if ( specificTests == null )
{
- specificTests = new TestListResolver( getIncludeList(), getExcludeList() );
+ specificTests = new TestListResolver( getTest() );
}
return specificTests;
}
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 9d89447..7d7d15f 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -30,17 +30,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.apache.commons.io.FileUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -87,7 +84,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import static java.io.File.separatorChar;
-import static java.nio.charset.StandardCharsets.UTF_8;
import static java.nio.file.Files.write;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
@@ -99,8 +95,8 @@ import static org.apache.maven.artifact.versioning.VersionRange.createFromVersio
import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9;
import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT;
import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
@@ -1994,12 +1990,6 @@ public class AbstractSurefireMojoTest
private int failOnFlakeCount;
private String[] includeJUnit5Engines;
private String[] excludeJUnit5Engines;
- private List<Artifact> projectTestArtifacts;
- private File includesFile;
- private File excludesFile;
- private List<String> includes;
- private List<String> excludes;
- private String test;
private JUnitPlatformProviderInfo createJUnitPlatformProviderInfo( Artifact junitPlatformArtifact,
TestClassPath testClasspathWrapper )
@@ -2007,17 +1997,6 @@ public class AbstractSurefireMojoTest
return new JUnitPlatformProviderInfo( null, junitPlatformArtifact, testClasspathWrapper );
}
- void setProjectTestArtifacts( List<Artifact> projectTestArtifacts )
- {
- this.projectTestArtifacts = projectTestArtifacts;
- }
-
- @Override
- List<Artifact> getProjectTestArtifacts()
- {
- return projectTestArtifacts;
- }
-
@Override
protected void logDebugOrCliShowErrors( String s )
{
@@ -2135,48 +2114,43 @@ public class AbstractSurefireMojoTest
@Override
public String getTest()
{
- return test;
+ return null;
}
@Override
public void setTest( String test )
{
- this.test = test;
+
}
@Override
public List<String> getIncludes()
{
- return includes;
+ return null;
}
@Override
- public void setIncludes( List<String> includes )
- {
- this.includes = includes;
- }
-
- void setIncludesFile( File includesFile )
+ public File getIncludesFile()
{
- this.includesFile = includesFile;
+ return null;
}
@Override
- public File getIncludesFile()
+ public void setIncludes( List<String> includes )
{
- return includesFile;
+
}
@Override
public List<String> getExcludes()
{
- return excludes;
+ return null;
}
@Override
public void setExcludes( List<String> excludes )
{
- this.excludes = excludes;
+
}
@Override
@@ -2335,15 +2309,10 @@ public class AbstractSurefireMojoTest
return null;
}
- void setExcludesFile( File excludesFile )
- {
- this.excludesFile = excludesFile;
- }
-
@Override
public File getExcludesFile()
{
- return excludesFile;
+ return null;
}
@Override
@@ -2514,151 +2483,6 @@ public class AbstractSurefireMojoTest
}
}
- @Test
- public void shouldNotPerformMethodFilteringOnIncludes() throws Exception
- {
- Mojo plugin = new Mojo();
-
- File includesExcludes = File.createTempFile( "surefire", "-includes" );
- FileUtils.write( includesExcludes, "AnotherTest#method" , UTF_8 );
- plugin.setIncludesFile( includesExcludes );
-
- List<String> includes = new LinkedList<>();
- includes.add( "AnotherTest#method " );
- plugin.setIncludes( includes );
-
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- ArtifactHandler handler = new DefaultArtifactHandler();
- Artifact testDeps = new DefaultArtifact( "g", "a", version, "compile", "jar", null, handler );
- File artifactFile = File.createTempFile( "surefire", ".jar" );
- artifactFile.deleteOnExit();
- testDeps.setFile( artifactFile );
- plugin.setProjectTestArtifacts( singletonList( testDeps ) );
- plugin.setDependenciesToScan( new String[] { "g:a" } );
-
- e.expectMessage( "Method filter prohibited in includes|excludes parameter: AnotherTest#method " );
- plugin.scanDependencies();
- }
-
- @Test
- public void shouldFilterTestsOnIncludesFile() throws Exception
- {
- Mojo plugin = new Mojo();
-
- plugin.setLogger( mock( Logger.class ) );
-
- File includes = File.createTempFile( "surefire", "-includes" );
- FileUtils.write( includes, "AnotherTest#method" , UTF_8 );
- plugin.setIncludesFile( includes );
-
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- ArtifactHandler handler = new DefaultArtifactHandler();
- Artifact testDeps = new DefaultArtifact( "g", "a", version, "compile", "test-jar", null, handler );
- File artifactFile = File.createTempFile( "surefire", "-classes" );
- String classDir = artifactFile.getCanonicalPath();
- assertThat( artifactFile.delete() ).isTrue();
- File classes = new File( classDir );
- assertThat( classes.mkdir() ).isTrue();
- testDeps.setFile( classes );
- assertThat( new File( classes, "AnotherTest.class" ).createNewFile() )
- .isTrue();
- plugin.setProjectTestArtifacts( singletonList( testDeps ) );
- plugin.setDependenciesToScan( new String[] { "g:a" } );
-
- DefaultScanResult result = plugin.scanDependencies();
- assertThat ( result.getClasses() ).hasSize( 1 );
- assertThat ( result.getClasses().iterator().next() ).isEqualTo( "AnotherTest" );
- }
-
- @Test
- public void shouldFilterTestsOnExcludesFile() throws Exception
- {
- Mojo plugin = new Mojo();
-
- plugin.setLogger( mock( Logger.class ) );
-
- File excludes = File.createTempFile( "surefire", "-excludes" );
- FileUtils.write( excludes, "AnotherTest" , UTF_8 );
- plugin.setExcludesFile( excludes );
-
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- ArtifactHandler handler = new DefaultArtifactHandler();
- Artifact testDeps = new DefaultArtifact( "g", "a", version, "compile", "test-jar", null, handler );
- File artifactFile = File.createTempFile( "surefire", "-classes" );
- String classDir = artifactFile.getCanonicalPath();
- assertThat( artifactFile.delete() ).isTrue();
- File classes = new File( classDir );
- assertThat( classes.mkdir() ).isTrue();
- testDeps.setFile( classes );
- assertThat( new File( classes, "AnotherTest.class" ).createNewFile() )
- .isTrue();
- plugin.setProjectTestArtifacts( singletonList( testDeps ) );
- plugin.setDependenciesToScan( new String[] { "g:a" } );
-
- DefaultScanResult result = plugin.scanDependencies();
- assertThat ( result.getClasses() )
- .isEmpty();
- }
-
- @Test
- public void shouldFilterTestsOnExcludes() throws Exception
- {
- Mojo plugin = new Mojo();
-
- plugin.setLogger( mock( Logger.class ) );
-
- plugin.setExcludes( singletonList( "AnotherTest" ) );
-
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- ArtifactHandler handler = new DefaultArtifactHandler();
- Artifact testDeps = new DefaultArtifact( "g", "a", version, "compile", "jar", null, handler );
- File artifactFile = File.createTempFile( "surefire", "-classes" );
- String classDir = artifactFile.getCanonicalPath();
- assertThat( artifactFile.delete() ).isTrue();
- File classes = new File( classDir );
- assertThat( classes.mkdir() ).isTrue();
- testDeps.setFile( classes );
- assertThat( new File( classes, "AnotherTest.class" ).createNewFile() )
- .isTrue();
- plugin.setProjectTestArtifacts( singletonList( testDeps ) );
- plugin.setDependenciesToScan( new String[] { "g:a" } );
-
- DefaultScanResult result = plugin.scanDependencies();
- assertThat ( result.getClasses() )
- .isEmpty();
- }
-
- @Test
- public void shouldUseOnlySpecificTests() throws Exception
- {
- Mojo plugin = new Mojo();
-
- plugin.setLogger( mock( Logger.class ) );
-
- File includes = File.createTempFile( "surefire", "-includes" );
- FileUtils.write( includes, "AnotherTest" , UTF_8 );
- plugin.setIncludesFile( includes );
- plugin.setTest( "DifferentTest" );
-
- VersionRange version = VersionRange.createFromVersion( "1.0" );
- ArtifactHandler handler = new DefaultArtifactHandler();
- Artifact testDeps = new DefaultArtifact( "g", "a", version, "compile", "test-jar", null, handler );
- File artifactFile = File.createTempFile( "surefire", "-classes" );
- String classDir = artifactFile.getCanonicalPath();
- assertThat( artifactFile.delete() ).isTrue();
- File classes = new File( classDir );
- assertThat( classes.mkdir() ).isTrue();
- testDeps.setFile( classes );
- assertThat( new File( classes, "AnotherTest.class" ).createNewFile() )
- .isTrue();
- plugin.setProjectTestArtifacts( singletonList( testDeps ) );
- plugin.setDependenciesToScan( new String[] { "g:a" } );
-
- DefaultScanResult result = plugin.scanDependencies();
- assertThat ( result.getClasses() )
- .isEmpty();
- }
-
private static File mockFile( String absolutePath )
{
File f = mock( File.class );
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
index 6ad0416..1548dfd 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java
@@ -32,7 +32,6 @@ import org.apache.maven.surefire.extensions.ForkNodeFactory;
import org.apache.maven.surefire.api.suite.RunResult;
import org.apache.maven.surefire.api.util.DefaultScanResult;
import org.apache.maven.toolchain.Toolchain;
-import org.codehaus.plexus.logging.Logger;
import org.junit.Test;
import java.io.File;
@@ -45,7 +44,6 @@ import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
import static org.powermock.reflect.Whitebox.invokeMethod;
import static org.powermock.reflect.Whitebox.setInternalState;
@@ -245,7 +243,6 @@ public class MojoMocklessTest
List<Artifact> projectTestArtifacts = singletonList( testDeps );
String[] dependenciesToScan = { "g:a" };
Mojo mojo = new Mojo( projectTestArtifacts, dependenciesToScan );
- mojo.setLogger( mock( Logger.class ) );
DefaultScanResult result = mojo.scanDependencies();
assertThat( result )
@@ -278,7 +275,6 @@ public class MojoMocklessTest
List<Artifact> projectTestArtifacts = singletonList( testDeps );
String[] dependenciesToScan = { "g:a" };
Mojo mojo = new Mojo( projectTestArtifacts, dependenciesToScan );
- mojo.setLogger( mock( Logger.class ) );
DefaultScanResult result = mojo.scanDependencies();
assertThat( result )
@@ -310,7 +306,6 @@ public class MojoMocklessTest
List<Artifact> projectTestArtifacts = singletonList( testDeps );
String[] dependenciesToScan = { "g:a" };
Mojo mojo = new Mojo( projectTestArtifacts, dependenciesToScan );
- mojo.setLogger( mock( Logger.class ) );
DefaultScanResult result = mojo.scanDependencies();
assertThat( result )
@@ -357,7 +352,6 @@ public class MojoMocklessTest
List<Artifact> projectTestArtifacts = asList( testDep1, testDep2 );
String[] dependenciesToScan = { "g:a" };
Mojo mojo = new Mojo( projectTestArtifacts, dependenciesToScan );
- mojo.setLogger( mock( Logger.class ) );
DefaultScanResult result = mojo.scanDependencies();
assertThat( result )
diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
index 2ce8caa..240d2a5 100644
--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
@@ -355,12 +355,6 @@ public class SurefirePlugin
* **{@literal /}NotIncludedByDefault.java
* %regex[.*Test.*|.*Not.*]
* </code></pre>
- *
- * Since 3.0.0-M6, method filtering support is provided in includes file. Example:
- * <pre><code>
- * foo.bar.SomeTest#test
- * com.test.Test#testMethod
- * </code></pre>
*
* @since 2.13
*/
@@ -376,12 +370,6 @@ public class SurefirePlugin
* %regex[.*Test.*|.*Not.*]
* </code></pre>
*
- * Since 3.0.0-M6, method filtering support is provided in excludes file. Example:
- * <pre><code>
- * foo.bar.SomeTest#test
- * com.test.Test#testMethod
- * </code></pre>
- *
* @since 2.13
*/
@Parameter( property = "surefire.excludesFile" )
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
index 055c407..6c458f5 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractTestMultipleMethodPatterns.java
@@ -483,6 +483,7 @@ public abstract class AbstractTestMultipleMethodPatterns
prepare( pattern )
.failNever()
.executeTest()
- .verifyTextInLog( "Method filter prohibited in includes|excludes parameter: " + pattern );
+ .verifyTextInLog( "Method filter prohibited in includes|excludes|includesFile|excludesFile parameter: "
+ + pattern );
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1964IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1964IT.java
deleted file mode 100644
index 62f60d2..0000000
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1964IT.java
+++ /dev/null
@@ -1,55 +0,0 @@
-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;
-
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
-
-/**
- *
- */
-public class Surefire1964IT extends SurefireJUnit4IntegrationTestCase
-{
- @Test
- public void shouldFilterTests() throws Exception
- {
- unpack( "surefire-1964" )
- .executeTest()
- .assertTestSuiteResults( 1 )
- .assertThatLogLine( containsString( "executed testXYZ" ), is( 1 ) )
- .assertThatLogLine( containsString( "executed testABC" ), is( 0 ) )
- .assertThatLogLine( containsString( "executed dontRun" ), is( 0 ) );
- }
-
- @Test
- public void shouldFilterTestsInPluginProcess() throws Exception
- {
- unpack( "surefire-1964" )
- .forkCount( 0 )
- .executeTest()
- .assertTestSuiteResults( 1 )
- .assertThatLogLine( containsString( "executed testXYZ" ), is( 1 ) )
- .assertThatLogLine( containsString( "executed testABC" ), is( 0 ) )
- .assertThatLogLine( containsString( "executed dontRun" ), is( 0 ) );
- }
-}
diff --git a/surefire-its/src/test/resources/surefire-1964/exclusions.txt b/surefire-its/src/test/resources/surefire-1964/exclusions.txt
deleted file mode 100644
index 5bacad2..0000000
--- a/surefire-its/src/test/resources/surefire-1964/exclusions.txt
+++ /dev/null
@@ -1 +0,0 @@
-FilterTest#testABC
\ No newline at end of file
diff --git a/surefire-its/src/test/resources/surefire-1964/inclusions.txt b/surefire-its/src/test/resources/surefire-1964/inclusions.txt
deleted file mode 100644
index 50077e4..0000000
--- a/surefire-its/src/test/resources/surefire-1964/inclusions.txt
+++ /dev/null
@@ -1 +0,0 @@
-FilterTest#test*
\ No newline at end of file
diff --git a/surefire-its/src/test/resources/surefire-1964/pom.xml b/surefire-its/src/test/resources/surefire-1964/pom.xml
deleted file mode 100644
index 8f3ba29..0000000
--- a/surefire-its/src/test/resources/surefire-1964/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.example</groupId>
- <artifactId>maven-surefire-excludefiles</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <properties>
- <maven.compiler.source>${java.specification.version}</maven.compiler.source>
- <maven.compiler.target>${java.specification.version}</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <includesFile>inclusions.txt</includesFile>
- <excludesFile>exclusions.txt</excludesFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/surefire-its/src/test/resources/surefire-1964/src/test/java/pkg/ExcludedTest.java b/surefire-its/src/test/resources/surefire-1964/src/test/java/pkg/ExcludedTest.java
deleted file mode 100644
index b871231..0000000
--- a/surefire-its/src/test/resources/surefire-1964/src/test/java/pkg/ExcludedTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-public class ExcludedTest
-{
- @Test
- public void dontRun()
- {
- System.out.println( "executed dontRun" );
- }
-}
diff --git a/surefire-its/src/test/resources/surefire-1964/src/test/java/pkg/FilterTest.java b/surefire-its/src/test/resources/surefire-1964/src/test/java/pkg/FilterTest.java
deleted file mode 100644
index d93eca9..0000000
--- a/surefire-its/src/test/resources/surefire-1964/src/test/java/pkg/FilterTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package pkg;
-
-import org.junit.Test;
-
-public class FilterTest
-{
- @Test
- public void testABC()
- {
- System.out.println( "executed testABC" );
- }
-
- @Test
- public void dontRun()
- {
- System.out.println( "executed dontRun" );
- }
-
- @Test
- public void testXYZ()
- {
- System.out.println( "executed testXYZ" );
- }
-}