From 9993a89a43a05d50280f596f300774d8ae62149e Mon Sep 17 00:00:00 2001 From: Benjamin Marwell Date: Fri, 27 Oct 2023 08:00:56 +0200 Subject: [PATCH] [#74] rework integration tests pt.3, Wagon334MojoHttpIT --- .github/workflows/maven.yml | 4 +-- pom.xml | 4 --- .../mojo/wagon/Wagon334MojoHttpIT.java | 25 ++++++++++++++----- .../1.2/commons-dbutils-1.2-bin.tar.gz.asc | 1 + .../commons-dbutils-1.2-bin.tar.gz.asc.md5 | 1 + .../commons-dbutils-1.2-bin.tar.gz.asc.sha1 | 1 + src/test/projects/http-download-02/pom.xml | 5 ++-- 7 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc create mode 100644 src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.md5 create mode 100644 src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.sha1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f7d6089..6b88494 100644 --- a/.github/workflows/maven.yml +++ b/.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: '-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 + ff-goal: '-ntp -P run-its verify' # site use project version for reporting + verify-goal: '-ntp -P run-its verify' # should be the same as for first build deploy: name: Deploy diff --git a/pom.xml b/pom.xml index 43a7b7c..01088b2 100644 --- a/pom.xml +++ b/pom.xml @@ -231,9 +231,6 @@ - - install - @@ -322,7 +319,6 @@ integration-test - integration-test integration-test verify diff --git a/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java b/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java index a91a916..091b885 100644 --- 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/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc b/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc new file mode 100644 index 0000000..c6cac69 --- /dev/null +++ b/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc @@ -0,0 +1 @@ +empty diff --git a/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.md5 b/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.md5 new file mode 100644 index 0000000..c6cac69 --- /dev/null +++ b/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.md5 @@ -0,0 +1 @@ +empty diff --git a/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.sha1 b/src/test/projects/http-download-02/files/maven2/commons-dbutils/commons-dbutils/1.2/commons-dbutils-1.2-bin.tar.gz.asc.sha1 new file mode 100644 index 0000000..c6cac69 --- /dev/null +++ b/src/test/projects/http-download-02/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 index cdece8f..830b689 100644 --- a/src/test/projects/http-download-02/pom.xml +++ b/src/test/projects/http-download-02/pom.xml @@ -10,6 +10,7 @@ ${project.build.directory}/it/http-download 3.3.4 + 8080 @@ -40,7 +41,7 @@ download - https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils/1.2 + http://localhost:${server.port}/maven2/commons-dbutils/commons-dbutils/1.2 commons-dbutils-1.2-bin.tar.gz.asc, commons-dbutils-1.2-bin.tar.gz.asc.md5, @@ -53,4 +54,4 @@ - \ No newline at end of file +