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 08:31:12 UTC
[maven-integration-testing] branch master updated: Extend MavenITmng7470ResolverTransportTest (#160)
This is an automated email from the ASF dual-hosted git repository.
cstamas 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 ff841ac81 Extend MavenITmng7470ResolverTransportTest (#160)
ff841ac81 is described below
commit ff841ac81c89581a60aea28e2a626cfb0ea772f3
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri May 13 10:31:07 2022 +0200
Extend MavenITmng7470ResolverTransportTest (#160)
To cover the default case as well (nothing set), and make sure
Wagon is used.
---
.../it/MavenITmng7470ResolverTransportTest.java | 27 +++++++++++++++++-----
1 file changed, 21 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..0c4b7973a 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,31 @@ 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.resolver.resolver-demo-maven-plugin" );
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 +90,12 @@ public class MavenITmng7470ResolverTransportTest
verifier.resetStreams();
}
+ public void testResolverTransportDefault()
+ throws Exception
+ {
+ performTest( null, "[DEBUG] Using transporter WagonTransporter" );
+ }
+
public void testResolverTransportWagon()
throws Exception
{