You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ag...@apache.org on 2013/06/17 21:14:06 UTC
git commit: [SUREFIRE-1005] Fix test pattern matching in scanned
dependencies - this time for real
Updated Branches:
refs/heads/master edfaf2b86 -> cb908dd79
[SUREFIRE-1005] Fix test pattern matching in scanned dependencies - this time for real
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cb908dd7
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cb908dd7
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cb908dd7
Branch: refs/heads/master
Commit: cb908dd79452af854f8c2f7c7d544a3e5abc611d
Parents: edfaf2b
Author: Andreas Gudian <ag...@apache.org>
Authored: Mon Jun 17 21:13:15 2013 +0200
Committer: Andreas Gudian <ag...@apache.org>
Committed: Mon Jun 17 21:13:15 2013 +0200
----------------------------------------------------------------------
.../apache/maven/plugin/surefire/util/DependencyScanner.java | 3 ++-
.../apache/maven/plugin/surefire/util/DirectoryScanner.java | 3 ++-
.../org/apache/maven/plugin/surefire/util/ScannerUtil.java | 4 ++--
.../maven/plugin/surefire/util/SpecificFileFilter.java | 8 +++++---
.../maven/plugin/surefire/util/SpecificFileFilterTest.java | 3 ++-
5 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cb908dd7/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
index df36f08..636662f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DependencyScanner.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.surefire.util;
* under the License.
*/
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertJarFileResourceToJavaClassName;
+import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.processIncludesExcludes;
import java.io.File;
@@ -174,7 +175,7 @@ public class DependencyScanner
{
return false;
}
- name = ScannerUtil.convertJarFileResourceToSystemFileSeparator( name );
+ name = convertSlashToSystemFileSeparator( name );
boolean isIncluded = includes.matches( name, false );
boolean isExcluded = excludes.matches( name, false );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cb908dd7/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
index 1d1f3dc..e0cc18d 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java
@@ -18,6 +18,7 @@ package org.apache.maven.plugin.surefire.util;
* specific language governing permissions and limitations
* under the License.
*/
+import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertToJavaClassName;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.processIncludesExcludes;
import static org.apache.maven.plugin.surefire.util.ScannerUtil.stripBaseDir;
@@ -78,7 +79,7 @@ public class DirectoryScanner
scanner.scan();
for ( String test : scanner.getIncludedFiles() )
{
- if ( specificTestFilter.accept( stripBaseDir( basedir.getAbsolutePath(), test ) ) )
+ if ( specificTestFilter.accept( convertSlashToSystemFileSeparator( stripBaseDir( basedir.getAbsolutePath(), test ) ) ) )
{
result.add( convertToJavaClassName( test ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cb908dd7/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
index 8752194..124f656 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java
@@ -49,7 +49,7 @@ final class ScannerUtil {
return StringUtils.removeEnd( test, ".class" ).replace( "/", "." );
}
- public static @Nonnull String convertJarFileResourceToSystemFileSeparator( @Nonnull String path )
+ public static @Nonnull String convertSlashToSystemFileSeparator( @Nonnull String path )
{
return ( IS_NON_UNIX_FS ? path.replace( "/", FS ) : path );
}
@@ -78,7 +78,7 @@ final class ScannerUtil {
{
inc = StringUtils.removeEnd( inc, JAVA_SOURCE_FILE_EXTENSION ) + JAVA_CLASS_FILE_EXTENSION;
}
- incs[i] = inc;
+ incs[i] = convertSlashToSystemFileSeparator( inc );
}
return incs;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cb908dd7/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
index 272ceb6..db2d477 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java
@@ -26,6 +26,8 @@ import javax.annotation.Nullable;
import org.apache.maven.shared.utils.io.SelectorUtils;
+import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
+
public class SpecificFileFilter
{
@@ -38,12 +40,12 @@ public class SpecificFileFilter
this.names = new HashSet<String>();
for ( String name : classNames )
{
- names.add( ScannerUtil.convertJarFileResourceToSystemFileSeparator( name ) );
+ names.add( convertSlashToSystemFileSeparator( name ) );
}
}
}
- public boolean accept( @Nullable String className )
+ public boolean accept( @Nullable String resourceName )
{
// If the tests enumeration is empty, allow anything.
if ( names != null && !names.isEmpty() )
@@ -52,7 +54,7 @@ public class SpecificFileFilter
{
// This is the same utility used under the covers in the plexus DirectoryScanner, and
// therefore in the surefire DefaultDirectoryScanner implementation.
- if ( SelectorUtils.matchPath( pattern, className, true ) )
+ if ( SelectorUtils.matchPath( pattern, resourceName, true ) )
{
return true;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cb908dd7/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
index 98d1509..752c7cb 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/util/SpecificFileFilterTest.java
@@ -19,6 +19,7 @@ package org.apache.maven.plugin.surefire.util;
* under the License.
*/
+import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator;
import junit.framework.TestCase;
/**
@@ -58,6 +59,6 @@ public class SpecificFileFilterTest
private String getFile()
{
- return "org/apache/maven/surefire/SpecificTestClassFilter.class";
+ return convertSlashToSystemFileSeparator( "org/apache/maven/surefire/SpecificTestClassFilter.class" );
}
}