[#74] rework integration tests pt.3, Wagon334MojoHttpIT

mojohaus · Oct 27, 2023 · 97db3f7 · 97db3f7
1 parent 6f174f1
commit 97db3f7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java b/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java
@@ -2,7 +2,10 @@
 
 import java.io.File;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -17,17 +20,21 @@
 
 @RunWith( MavenJUnitTestRunner.class )
 @MavenVersions( { "3.6.3" } )
-public class Wagon334MojoHttpIT
+public class Wagon334MojoHttpIT extends AbstractJettyIT
 {
     @Rule
     public final TestResources resources = new TestResources();
 
-    public final MavenRuntime maven;
+    private final MavenRuntimeBuilder mavenBuilder;
+    public MavenRuntime maven;
 
-    public Wagon334MojoHttpIT(MavenRuntimeBuilder builder )
-        throws Exception
-    {
-        this.maven = builder.withCliOptions( "-B" ).build();
+    public Wagon334MojoHttpIT(MavenRuntimeBuilder builder ) {
+        this.mavenBuilder = builder.withCliOptions( "-B" );
+    }
+
+    @Before
+    public void setPort() throws Exception {
+        this.maven = this.mavenBuilder.withCliOptions( "-Dserver.port=" + getServerPort() ).build();
     }
 
     @Test
@@ -46,4 +53,10 @@ public void testDownload()
         Assert.assertTrue( new File(downloadDir, "commons-dbutils-1.2-bin.tar.gz.asc.md5" ).exists() );
         Assert.assertTrue( new File(downloadDir, "commons-dbutils-1.2-bin.tar.gz.asc.sha1" ).exists() );
     }
+
+    @Override
+    protected Path getDirectoryToServe() throws IOException {
+        return resources.getBasedir("http-download-02").toPath()
+            .resolve("files");
+    }
 }
diff --git a/...ad-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc b/...ad-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc
@@ -0,0 +1 @@
+empty
diff --git a/...2/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.md5 b/...2/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.md5
@@ -0,0 +1 @@
+empty
diff --git a/.../files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.sha1 b/.../files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.sha1
@@ -0,0 +1 @@
+empty
diff --git a/src/test/projects/http-download-02/pom.xml b/src/test/projects/http-download-02/pom.xml
@@ -10,6 +10,7 @@
   <properties>
     <downloadDirectory.base>${project.build.directory}/it/http-download</downloadDirectory.base>
     <wagon.api.version>3.3.4</wagon.api.version>
+    <server.port>8080</server.port>
   </properties>
 
   <build>
@@ -40,7 +41,7 @@
               <goal>download</goal>
             </goals>
             <configuration>
-              <url>https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils/1.2</url>
+              <url>http://localhost:${server.port}/maven2/commons-dbutils/commons-dbutils/1.2</url>
               <includes>
                 commons-dbutils-1.2-bin.tar.gz.asc,
                 commons-dbutils-1.2-bin.tar.gz.asc.md5,
@@ -53,4 +54,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>