You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/11/13 17:15:28 UTC
[maven-integration-testing] branch master updated: Allow basedir system property to be null for build info.txt
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 426e13579 Allow basedir system property to be null for build info.txt
426e13579 is described below
commit 426e13579a327186777f603aa4f6a75bef143602
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Nov 11 13:28:30 2022 +0100
Allow basedir system property to be null for build info.txt
- basedir can be null when test is executed by IDE, use default value
- use try-with-resources
---
.../org/apache/maven/it/TestSuiteOrdering.java | 35 ++++++++--------------
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
index 62d1ec8e8..897e09397 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.maven.shared.verifier.Verifier;
-import org.codehaus.plexus.util.IOUtil;
import org.junit.jupiter.api.ClassDescriptor;
import org.junit.jupiter.api.ClassOrderer;
import org.junit.jupiter.api.ClassOrdererContext;
@@ -51,37 +50,27 @@ public class TestSuiteOrdering implements ClassOrderer
{
try
{
- PrintStream info = null;
- Verifier verifier = null;
- try
- {
- verifier = new Verifier( "" );
- String mavenVersion = verifier.getMavenVersion();
-
- String executable = verifier.getExecutable();
+ Verifier verifier = new Verifier( "" );
+ String mavenVersion = verifier.getMavenVersion();
+ String executable = verifier.getExecutable();
- out.println( "Running integration tests for Maven " + mavenVersion + System.lineSeparator()
- + "\tusing Maven executable: " + executable + System.lineSeparator()
- + "\twith verifier.forkMode: " + System.getProperty( "verifier.forkMode", "not defined == fork" ) );
+ out.println( "Running integration tests for Maven " + mavenVersion + System.lineSeparator()
+ + "\tusing Maven executable: " + executable + System.lineSeparator()
+ + "\twith verifier.forkMode: " + System.getProperty( "verifier.forkMode",
+ "not defined == fork" ) );
- System.setProperty( "maven.version", mavenVersion );
+ System.setProperty( "maven.version", mavenVersion );
- String basedir = System.getProperty( "basedir" );
- info = new PrintStream( Files.newOutputStream( Paths.get( basedir, "target/info.txt" ) ) );
+ String basedir = System.getProperty( "basedir", "." );
+ try ( PrintStream info = new PrintStream(
+ Files.newOutputStream( Paths.get( basedir, "target/info.txt" ) ) ) )
+ {
infoProperty( info, "maven.version" );
infoProperty( info, "java.version" );
infoProperty( info, "os.name" );
infoProperty( info, "os.version" );
}
- finally
- {
- if ( verifier != null )
- {
- verifier.resetStreams();
- }
- IOUtil.close( info );
- }
}
catch ( Exception e )
{