Repository: maven-surefire Updated Branches: refs/heads/master d7bf6ce49 -> f841a16e4
[SUREFIRE] 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/68246e2f Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/68246e2f Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/68246e2f Branch: refs/heads/master Commit: 68246e2f93daeee0cbcbaf342fa4a4a485c72899 Parents: d7bf6ce Author: Tibor17 <tibo...@lycos.com> Authored: Sun Dec 11 09:51:41 2016 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Sun Dec 11 09:51:41 2016 +0100 ---------------------------------------------------------------------- .../plugin/surefire/AbstractSurefireMojo.java | 8 ++++--- .../maven/surefire/util/UrlUtilsTest.java | 25 ++++---------------- 2 files changed, 10 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/68246e2f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java ---------------------------------------------------------------------- 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 127ec82..3606be2 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 @@ -101,6 +101,8 @@ import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; import static org.apache.maven.shared.utils.StringUtils.isEmpty; import static org.apache.maven.shared.utils.StringUtils.isNotBlank; import static org.apache.maven.shared.utils.StringUtils.split; +import static org.apache.maven.surefire.suite.RunResult.failure; +import static org.apache.maven.surefire.suite.RunResult.noTestsRun; /** * Abstract base class for running tests using Surefire. @@ -774,7 +776,7 @@ public abstract class AbstractSurefireMojo throw new MojoFailureException( "No tests were executed! (Set -DfailIfNoTests=false to ignore this error.)" ); } - handleSummary( RunResult.noTestsRun(), null ); + handleSummary( noTestsRun(), null ); return; } logReportsDirectory(); @@ -893,7 +895,7 @@ public abstract class AbstractSurefireMojo { List<ProviderInfo> providers = createProviders(); - RunResult current = RunResult.noTestsRun(); + RunResult current = noTestsRun(); Exception firstForkException = null; for ( ProviderInfo provider : providers ) @@ -927,7 +929,7 @@ public abstract class AbstractSurefireMojo if ( firstForkException != null ) { - current = RunResult.failure( current, firstForkException ); + current = failure( current, firstForkException ); } handleSummary( current, firstForkException ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/68246e2f/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java index 3d9a07f..964fa10 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java @@ -22,8 +22,7 @@ package org.apache.maven.surefire.util; import junit.framework.TestCase; import java.io.File; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; +import java.net.URI; import java.net.URL; import static org.apache.maven.surefire.util.internal.UrlUtils.toURL; @@ -58,27 +57,13 @@ public class UrlUtilsTest { File f = new File( homeDir, fileName ); URL u = toURL( f ); + URI uri = u.toURI(); + File urlFile = new File( uri ); String url = u.toString(); + assertStartsWith( url, "file:" ); assertEndsWith( url, expectedFileName ); - - try - { - // use reflection to do "URI uri = u.toURI()" if JDK 1.5+ - Method toURI = URL.class.getMethod( "toURI", null ); - Object uri = toURI.invoke( u, null ); - - // use reflection to do "File urlFile = new File( uri )" if JDK 1.4+ - Constructor newFile = File.class.getConstructor( new Class[]{ uri.getClass() } ); - File urlFile = (File) newFile.newInstance( uri ); - - assertEquals( f, urlFile ); - } - catch ( NoSuchMethodException e ) - { - // URL.toURI() method in JDK 1.5+, not available currently - // we won't be able to check for file equality... - } + assertEquals( f, urlFile ); } private void assertStartsWith( String string, String substring )
