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 2016/08/21 12:20:14 UTC
[1/2] maven-surefire git commit: refactoring
Repository: maven-surefire
Updated Branches:
refs/heads/master 2a4f413f9 -> 68c3027d7
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/870641a7
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/870641a7
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/870641a7
Branch: refs/heads/master
Commit: 870641a7ea86448734eac42fd82dfe7f2725859f
Parents: 2a4f413
Author: Tibor17 <ti...@lycos.com>
Authored: Sat Aug 20 22:14:12 2016 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Sat Aug 20 22:14:12 2016 +0200
----------------------------------------------------------------------
.../maven/surefire/testset/TestListResolver.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/870641a7/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
index fc21425..3eeb23a 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
@@ -25,12 +25,15 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
+import static java.util.Collections.unmodifiableSet;
import static org.apache.maven.shared.utils.StringUtils.isBlank;
import static org.apache.maven.shared.utils.StringUtils.isNotBlank;
import static org.apache.maven.shared.utils.StringUtils.split;
import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX;
import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX;
import static java.util.Collections.singleton;
+import static org.apache.maven.surefire.testset.ResolvedTest.Type.CLASS;
+import static org.apache.maven.surefire.testset.ResolvedTest.Type.METHOD;
/**
* Resolved multi pattern filter e.g. -Dtest=MyTest#test,!AnotherTest#otherTest into an object model
@@ -78,8 +81,8 @@ public class TestListResolver
}
}
- this.includedPatterns = Collections.unmodifiableSet( includedFilters );
- this.excludedPatterns = Collections.unmodifiableSet( excludedFilters );
+ this.includedPatterns = unmodifiableSet( includedFilters );
+ this.excludedPatterns = unmodifiableSet( excludedFilters );
this.hasIncludedMethodPatterns = patterns.hasIncludedMethodPatterns;
this.hasExcludedMethodPatterns = patterns.hasExcludedMethodPatterns;
}
@@ -401,10 +404,10 @@ public class TestListResolver
return unwrap( regex.substring( from, to ) );
}
- static String[] unwrap( String request )
+ static String[] unwrap( final String request )
{
- String[] classAndMethod = new String[] { "", "" };
- int indexOfHash = request.indexOf( '#' );
+ final String[] classAndMethod = { "", "" };
+ final int indexOfHash = request.indexOf( '#' );
if ( indexOfHash == -1 )
{
classAndMethod[0] = request.trim();
@@ -452,11 +455,11 @@ public class TestListResolver
}
else if ( hasClass )
{
- test = new ResolvedTest( ResolvedTest.Type.CLASS, unwrapped[0], true );
+ test = new ResolvedTest( CLASS, unwrapped[0], true );
}
else if ( hasMethod )
{
- test = new ResolvedTest( ResolvedTest.Type.METHOD, unwrapped[1], true );
+ test = new ResolvedTest( METHOD, unwrapped[1], true );
}
}
else
@@ -464,7 +467,7 @@ public class TestListResolver
final int indexOfMethodSeparator = request.indexOf( '#' );
if ( indexOfMethodSeparator == -1 )
{
- test = new ResolvedTest( ResolvedTest.Type.CLASS, request, false );
+ test = new ResolvedTest( CLASS, request, false );
}
else
{
[2/2] maven-surefire git commit: [SUREFIRE-1270] Upgrade JaCoCo
Version to 0.7.7
Posted by ti...@apache.org.
[SUREFIRE-1270] Upgrade JaCoCo Version to 0.7.7
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/68c3027d
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/68c3027d
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/68c3027d
Branch: refs/heads/master
Commit: 68c3027d779e588668f1549ede3b1b51eb849a97
Parents: 870641a
Author: Tibor17 <ti...@lycos.com>
Authored: Sun Aug 21 14:18:53 2016 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Sun Aug 21 14:18:53 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/68c3027d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 978be2c..95198cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.5.201505241946</version>
+ <version>0.7.7.201606060606</version>
<configuration>
<includes>
<include>**/failsafe/*</include>