You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/05/13 07:42:58 UTC
[maven-integration-testing] branch extend-mng-7470-default created (now 29b9a7ab9)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch extend-mng-7470-default
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
at 29b9a7ab9 Extend MavenITmng7470ResolverTransportTest
This branch includes the following new commits:
new 29b9a7ab9 Extend MavenITmng7470ResolverTransportTest
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-integration-testing] 01/01: Extend MavenITmng7470ResolverTransportTest
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch extend-mng-7470-default
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 29b9a7ab91ab9133d6a406e9ad9d61d5662fa176
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri May 13 09:42:19 2022 +0200
Extend MavenITmng7470ResolverTransportTest
To cover the default case as well (nothing set), and make sure
Wagon is used.
---
.../it/MavenITmng7470ResolverTransportTest.java | 26 +++++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
index 68b82b53d..09c5b8f39 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7470ResolverTransportTest.java
@@ -13,8 +13,6 @@ import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng7470ResolverTransportTest
extends AbstractMavenIntegrationTestCase
{
- private File testDir;
-
private File projectDir;
private HttpServer server;
@@ -30,7 +28,7 @@ public class MavenITmng7470ResolverTransportTest
protected void setUp()
throws Exception
{
- testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-7470-resolver-transport" );
projectDir = new File( testDir, "project" );
server = HttpServer.builder()
@@ -57,20 +55,30 @@ public class MavenITmng7470ResolverTransportTest
}
}
- private void performTest( final String transport, final String logSnippet ) throws Exception
+ private void performTest( /* nullable */ final String transport, final String logSnippet ) throws Exception
{
Verifier verifier = newVerifier( projectDir.getAbsolutePath() );
Map<String, String> properties = new HashMap<>();
properties.put( "@port@", Integer.toString( port ) );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", properties );
- verifier.setLogFileName( transport + "-transport.log" );
+ if ( transport == null )
+ {
+ verifier.setLogFileName( "default-transport.log" );
+ }
+ else
+ {
+ verifier.setLogFileName( transport + "-transport.log" );
+ }
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.resolver-transport" );
verifier.addCliOption( "-X" );
verifier.addCliOption( "-s" );
verifier.addCliOption( new File( projectDir, "settings.xml" ).getAbsolutePath() );
verifier.addCliOption( "-Pmaven-core-it-repo" );
- verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
+ if ( transport != null )
+ {
+ verifier.addCliOption( "-Dmaven.resolver.transport=" + transport );
+ }
// Maven will fail if project dependencies cannot be resolved.
// As dependency exists ONLY in HTTP repo, it MUST be reached using selected transport and
// successfully resolved from it.
@@ -81,6 +89,12 @@ public class MavenITmng7470ResolverTransportTest
verifier.resetStreams();
}
+ public void testResolverTransportDefault()
+ throws Exception
+ {
+ performTest( null, "[DEBUG] Using transporter WagonTransporter" );
+ }
+
public void testResolverTransportWagon()
throws Exception
{