[#74] rework integration tests pt.2

.github/workflows/maven.yml

@@ -24,8 +24,8 @@ jobs:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
     with:
-      ff-goal: '-P run-its install'         # site use project version for reporting
-      verify-goal: '-P run-its install'     # should be the same as for first build
+      ff-goal: '-ntp -P run-its install'         # site use project version for reporting
+      verify-goal: '-ntp -P run-its install'     # should be the same as for first build
 
   deploy:
     name: Deploy

pom.xml

@@ -183,6 +183,12 @@
       <artifactId>slf4j-api</artifactId>
       <version>1.7.9</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.9</version>
+      <scope>test</scope>
+    </dependency>
 
     <!-- needed to debug plugin under m2e -->
     <dependency>
@@ -210,6 +216,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.4.51.v20230217</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>9.4.51.v20230217</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/org/codehaus/mojo/wagon/AbstractCopyMojo.java

@@ -80,4 +80,4 @@ private void disconnectWagon( Wagon wagon )
         }
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/AbstractSingleWagonMojo.java

@@ -92,4 +92,4 @@ public void execute()
     protected abstract void execute( Wagon wagon )
         throws MojoExecutionException, WagonException, IOException;
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/AbstractWagonMojo.java

@@ -61,4 +61,4 @@ protected WagonFileSet getWagonFileSet( String fromDir, String includes, String
     {
         return WagonUtils.getWagonFileSet( fromDir, includes, excludes, caseSensitive, toDir );
     }
-}
+}

src/main/java/org/codehaus/mojo/wagon/CopyMojo.java

@@ -78,4 +78,4 @@ protected void copy( Wagon srcWagon, Wagon targetWagon )
         wagonCopy.copy( srcWagon, fileSet, targetWagon, optimize, this.getLog() );
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/ExistMojo.java

@@ -56,4 +56,4 @@ protected void execute( Wagon wagon )
         }
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/MergeMavenRepoMojo.java

@@ -45,4 +45,4 @@ protected void copy( Wagon srcWagon, Wagon targetWagon )
         mavenRepoMerger.merge( srcWagon, targetWagon, optimize, this.getLog() );
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonUpload.java

@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.util.FileSetManager;
 import org.apache.maven.wagon.CommandExecutor;

src/main/java/org/codehaus/mojo/wagon/shared/WagonUpload.java

@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;

src/test/java/org/codehaus/mojo/wagon/AbstractJettyIT.java

@@ -0,0 +1,51 @@
+package org.codehaus.mojo.wagon;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.junit.After;
+import org.junit.Before;
+
+public abstract class AbstractJettyIT {
+
+    private Server server;
+    private int port;
+
+    @Before
+    public void runJetty() throws Exception {
+        server = new Server();
+        ServerConnector connector = new ServerConnector(server);
+        connector.setPort(0);
+        connector.setHost("localhost");
+        server.addConnector(connector);
+
+        ResourceHandler resource_handler = new ResourceHandler();
+        resource_handler.setDirectoriesListed(true);
+        resource_handler.setResourceBase(getDirectoryToServe().toString());
+
+        HandlerList handlers = new HandlerList();
+        handlers.setHandlers(new Handler[] { resource_handler, new DefaultHandler() });
+        server.setHandler(handlers);
+
+        server.start();
+        this.port = connector.getLocalPort();
+    }
+
+
+    @After
+    public void tearDown() throws Exception {
+        server.stop();
+    }
+
+    protected int getServerPort() {
+        return this.port;
+    }
+
+    protected abstract Path getDirectoryToServe() throws IOException;
+
+}

src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java

@@ -1,7 +1,13 @@
 package org.codehaus.mojo.wagon;
 
+import io.takari.maven.testing.TestResources;
+import io.takari.maven.testing.executor.MavenExecution;
+import io.takari.maven.testing.executor.MavenExecutionResult;
+import io.takari.maven.testing.executor.MavenRuntime;
+import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
+import io.takari.maven.testing.executor.MavenVersions;
+import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
 import java.io.File;
-
 import org.apache.ftpserver.ConnectionConfigFactory;
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.FtpServerFactory;
@@ -15,14 +21,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import io.takari.maven.testing.TestResources;
-import io.takari.maven.testing.executor.MavenExecution;
-import io.takari.maven.testing.executor.MavenExecutionResult;
-import io.takari.maven.testing.executor.MavenRuntime;
-import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
-import io.takari.maven.testing.executor.MavenVersions;
-import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
-
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.2.5" } )
 public class WagonMojoFtpBasicIT

src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java

@@ -1,11 +1,6 @@
 package org.codehaus.mojo.wagon;
 
-import java.io.File;
-
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static java.util.Objects.requireNonNull;
 
 import io.takari.maven.testing.TestResources;
 import io.takari.maven.testing.executor.MavenExecution;
@@ -14,20 +9,36 @@
 import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
 import io.takari.maven.testing.executor.MavenVersions;
 import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.2.5" } )
-public class WagonMojoHttpIT
+public class WagonMojoHttpIT extends AbstractJettyIT
 {
     @Rule
     public final TestResources resources = new TestResources();
+    private final MavenRuntimeBuilder mavenBuilder;
 
-    public final MavenRuntime maven;
+    public MavenRuntime maven;
 
     public WagonMojoHttpIT( MavenRuntimeBuilder builder )
         throws Exception
     {
-        this.maven = builder.withCliOptions( "-B" ).build();
+        this.mavenBuilder = builder.withCliOptions( "-B" );
+    }
+
+    @Before
+    public void setPort() throws Exception {
+        this.maven = this.mavenBuilder.withCliOptions( "-Dserver.port=" + getServerPort() ).build();
     }
 
     @Test
@@ -41,6 +52,12 @@ public void testDownload()
         result.assertErrorFreeLog();
 
         Assert.assertTrue( new File( result.getBasedir(),
-                        "target/it/http-download/1.1/commons-dbutils-1.1-sources.jar" ).exists() );
+                        "target/it/http-download/1.1/commons-dbutils-1.1-sources.txt" ).exists() );
+    }
+
+    @Override
+    protected Path getDirectoryToServe() throws IOException {
+        return resources.getBasedir("http-download").toPath()
+            .resolve("files");
     }
 }

src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java

@@ -1,32 +1,39 @@
 package org.codehaus.mojo.wagon;
 
-import java.io.File;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import io.takari.maven.testing.TestResources;
 import io.takari.maven.testing.executor.MavenExecution;
 import io.takari.maven.testing.executor.MavenExecutionResult;
 import io.takari.maven.testing.executor.MavenRuntime;
 import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder;
 import io.takari.maven.testing.executor.MavenVersions;
 import io.takari.maven.testing.executor.junit.MavenJUnitTestRunner;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.2.5" } )
-public class WagonMojoHttpSettingsIT
+public class WagonMojoHttpSettingsIT extends AbstractJettyIT
 {
     @Rule
     public final TestResources resources = new TestResources();
 
-    public final MavenRuntime maven;
+    public MavenRuntime maven;
+    private final MavenRuntimeBuilder mavenBuilder;
 
     public WagonMojoHttpSettingsIT( MavenRuntimeBuilder builder )
         throws Exception
     {
-        this.maven = builder.withCliOptions( "-B", "-e", "-s", "settings.xml" ).build();
+        this.mavenBuilder = builder.withCliOptions( "-B", "-e", "-s", "settings.xml");
+    }
+
+    @Before
+    public void setPort() throws Exception {
+        this.maven = this.mavenBuilder.withCliOptions( "-Dserver.port=" + getServerPort() ).build();
     }
 
     @Test
@@ -39,4 +46,10 @@ public void testDownload()
         MavenExecutionResult result = mavenExec.execute( "clean", "verify" );
         result.assertErrorFreeLog();
     }
+
+    @Override
+    protected Path getDirectoryToServe() throws IOException {
+        return resources.getBasedir("http-download").toPath()
+            .resolve("files");
+    }
 }

src/test/projects/http-download/files/maven2/commons-dbutils/commons-dbutils/1.1/common-dbutils-1.1.pom.asc

@@ -0,0 +1 @@
+empty

src/test/projects/http-download/files/maven2/commons-dbutils/commons-dbutils/1.1/commons-dbutils-1.1-sources.txt

@@ -0,0 +1 @@
+empty

src/test/projects/http-download/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-sources.txt

@@ -0,0 +1 @@
+empty

src/test/projects/http-download/pom.xml

@@ -10,6 +10,7 @@
   <properties>
     <downloadDirectory.base>${project.build.directory}/it/http-download</downloadDirectory.base>
     <wagon.api.version>3.0.0</wagon.api.version>
+    <server.port>8080</server.port>
   </properties>
 
   <build>
@@ -42,7 +43,7 @@
               <goal>list</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils</url>
+              <url>http://localhost:${server.port}/maven2/commons-dbutils/commons-dbutils</url>
             </configuration>
           </execution>
 
@@ -54,8 +55,8 @@
               <goal>download-single</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils/1.1</url>
-              <fromFile>commons-dbutils-1.1-sources.jar</fromFile>
+              <url>http://localhost:${server.port}/maven2/commons-dbutils/commons-dbutils/1.1</url>
+              <fromFile>commons-dbutils-1.1-sources.txt</fromFile>
               <toDir>${downloadDirectory.base}</toDir>
             </configuration>
           </execution>
@@ -66,7 +67,7 @@
               <goal>download-single</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-sources.jar</url>
+              <url>http://localhost:${server.port}/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-sources.txt</url>
               <toDir>${downloadDirectory.base}</toDir>
             </configuration>
           </execution>
@@ -77,7 +78,7 @@
               <goal>download</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils</url>
+              <url>http://localhost:${server.port}/maven2/commons-dbutils/commons-dbutils</url>
               <includes>1.1/**</includes>
               <excludes>1.0/**, 1.2/**, 1.3/**, 1.4/**, 1.5/**, 1.6/**</excludes>
               <toDir>${downloadDirectory.base}</toDir>

src/test/resources/simplelogger.properties

@@ -0,0 +1 @@
+org.slf4j.simpleLogger.defaultLogLevel=warn