Updated Branches: refs/heads/master bb4ed4585 -> 231773324
Fixed testbreak on windows Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/23177332 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/23177332 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/23177332 Branch: refs/heads/master Commit: 231773324ca4143dea7f0857748f17b1aacb961e Parents: bb4ed45 Author: Kristian Rosenvold <[email protected]> Authored: Tue May 7 18:47:46 2013 +0200 Committer: Kristian Rosenvold <[email protected]> Committed: Tue May 7 18:47:46 2013 +0200 ---------------------------------------------------------------------- .../plugin/surefire/util/DependencyScanner.java | 4 ++-- .../maven/plugin/surefire/util/ScannerUtil.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23177332/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 cfdecff..b50f295 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 @@ -18,7 +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.convertToJavaClassName; +import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertJarFileResourceToJavaClassName; import static org.apache.maven.plugin.surefire.util.ScannerUtil.processIncludesExcludes; import java.io.File; @@ -90,7 +90,7 @@ public class DependencyScanner { JarEntry entry = entries.nextElement(); if(matcher.shouldInclude(entry.getName())) { - found.add(convertToJavaClassName(entry.getName())); + found.add(convertJarFileResourceToJavaClassName( entry.getName() )); } } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/23177332/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 5ca9644..3498e63 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 @@ -40,6 +40,11 @@ final class ScannerUtil { return StringUtils.removeEnd( test, ".class" ).replace( FS, "." ); } + public static String convertJarFileResourceToJavaClassName( String test ) + { + return StringUtils.removeEnd( test, ".class" ).replace( "/", "." ); + } + public static String stripBaseDir( String basedir, String test ) { return StringUtils.removeStart( test, basedir );
