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/04/04 15:24:24 UTC
maven-surefire git commit: [SUREFIRE] Improved FileScanner and little
refactoring
Repository: maven-surefire
Updated Branches:
refs/heads/master 650626290 -> fe66d69f8
[SUREFIRE] Improved FileScanner and little refactoring
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/fe66d69f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/fe66d69f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/fe66d69f
Branch: refs/heads/master
Commit: fe66d69f87645dc1cd97d135fd8d14b64e27e724
Parents: 6506262
Author: Tibor17 <ti...@lycos.com>
Authored: Sat Apr 4 15:24:26 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Sat Apr 4 15:24:26 2015 +0200
----------------------------------------------------------------------
.../apache/maven/plugin/surefire/util/FileScanner.java | 10 +++++++---
.../org/apache/maven/surefire/util/DefaultScanResult.java | 3 +--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe66d69f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
index 5197ece..6636f29 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
@@ -35,8 +35,12 @@ final class FileScanner
FileScanner( File basedir, String ext )
{
this.basedir = basedir;
- ext = isBlank( ext ) ? null : ext.trim();
- this.ext = ext == null || ext.startsWith( "." ) ? ext : "." + ext;
+ ext = ext.trim();
+ if ( isBlank( ext ) )
+ {
+ throw new IllegalArgumentException( "No file extension" );
+ }
+ this.ext = ext.startsWith( "." ) ? ext : "." + ext;
}
void scanTo( Collection<String> scannedJavaClassNames, TestFilter<String, String> filter )
@@ -119,6 +123,6 @@ final class FileScanner
{
String pathWithoutExtension =
path.length() == 0 ? fileNameWithoutExtension : path + '/' + fileNameWithoutExtension;
- return pathWithoutExtension + '.' + ext;
+ return pathWithoutExtension + ext;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/fe66d69f/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
index ad94948..2645f13 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java
@@ -51,8 +51,7 @@ public class DefaultScanResult
public void writeTo( Properties properties )
{
- int size = files.size();
- for ( int i = 0; i < size; i++ )
+ for ( int i = 0, size = files.size(); i < size; i++ )
{
properties.setProperty( SCAN_RESULT_NUMBER + i, files.get( i ) );
}