From ee7d0b4a9c7459a430848abd65146e491d4d40b8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 17:18:24 +0000 Subject: [PATCH] [#74] rework integration tests pt.1 --- pom.xml | 19 +++++++++++++++++-- ...oHttpTest.java => Wagon334MojoHttpIT.java} | 4 ++-- ...asicTest.java => WagonMojoFtpBasicIT.java} | 10 +++++----- ...MojoHttpTest.java => WagonMojoHttpIT.java} | 4 ++-- ...Test.java => WagonMojoHttpSettingsIT.java} | 4 ++-- ...onMojoSshTest.java => WagonMojoSshIT.java} | 4 ++-- src/test/projects/ftp-basic/pom.xml | 6 +++--- src/test/projects/http-download/pom.xml | 2 +- 8 files changed, 34 insertions(+), 19 deletions(-) rename src/test/java/org/codehaus/mojo/wagon/{Wagon334MojoHttpTest.java => Wagon334MojoHttpIT.java} (94%) rename src/test/java/org/codehaus/mojo/wagon/{WagonMojoFtpBasicTest.java => WagonMojoFtpBasicIT.java} (90%) rename src/test/java/org/codehaus/mojo/wagon/{WagonMojoHttpTest.java => WagonMojoHttpIT.java} (93%) rename src/test/java/org/codehaus/mojo/wagon/{WagonMojoHttpSettingsTest.java => WagonMojoHttpSettingsIT.java} (91%) rename src/test/java/org/codehaus/mojo/wagon/{WagonMojoSshTest.java => WagonMojoSshIT.java} (93%) diff --git a/pom.xml b/pom.xml index 4b215b4..e12387a 100644 --- a/pom.xml +++ b/pom.xml @@ -86,8 +86,8 @@ 8 3.0.0 - 2.9.0 - 1.12.2 + 2.9.2 + 2.0.0 1.1.1 2022-01-18T09:14:02Z @@ -297,6 +297,21 @@ + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-test + integration-test + + integration-test + verify + + + + diff --git a/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpTest.java b/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java similarity index 94% rename from src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpTest.java rename to src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java index 26114be..a91a916 100644 --- a/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpTest.java +++ b/src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java @@ -17,14 +17,14 @@ @RunWith( MavenJUnitTestRunner.class ) @MavenVersions( { "3.6.3" } ) -public class Wagon334MojoHttpTest +public class Wagon334MojoHttpIT { @Rule public final TestResources resources = new TestResources(); public final MavenRuntime maven; - public Wagon334MojoHttpTest(MavenRuntimeBuilder builder ) + public Wagon334MojoHttpIT(MavenRuntimeBuilder builder ) throws Exception { this.maven = builder.withCliOptions( "-B" ).build(); diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicTest.java b/src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java similarity index 90% rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicTest.java rename to src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java index a94bbe8..4e944fc 100644 --- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicTest.java +++ b/src/test/java/org/codehaus/mojo/wagon/WagonMojoFtpBasicIT.java @@ -25,7 +25,7 @@ @RunWith( MavenJUnitTestRunner.class ) @MavenVersions( { "3.2.5" } ) -public class WagonMojoFtpBasicTest +public class WagonMojoFtpBasicIT { @Rule public final TestResources resources = new TestResources(); @@ -33,7 +33,7 @@ public class WagonMojoFtpBasicTest public final MavenRuntime maven; public final FtpServer ftpServer; - public WagonMojoFtpBasicTest( MavenRuntimeBuilder builder ) + public WagonMojoFtpBasicIT( MavenRuntimeBuilder builder ) throws Exception { this.ftpServer = createFtp(); @@ -60,9 +60,9 @@ public void testFtpBasic() MavenExecution mavenExec = maven.forProject( projDir ); MavenExecutionResult result = mavenExec.execute( "clean", "verify" ); result.assertErrorFreeLog(); - Assert.assertTrue( new File( result.getBasedir(), "target/it/WagonMojoFtpBasicTest.class" ).exists() ); - Assert.assertTrue( new File( result.getBasedir(), "target/it/single-dir/WagonMojoFtpBasicTest.class" ).exists() ); - Assert.assertTrue( new File( result.getBasedir(), "target/it/single-dir/WagonMojoHttpTest.class" ).exists() ); + Assert.assertTrue( new File( result.getBasedir(), "target/it/" + this.getClass().getSimpleName() + ".class" ).exists() ); + Assert.assertTrue( new File( result.getBasedir(), "target/it/single-dir/"+ this.getClass().getSimpleName() + ".class" ).exists() ); + Assert.assertTrue( new File( result.getBasedir(), "target/it/single-dir/" + this.getClass().getSimpleName() + ".class" ).exists() ); } diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpTest.java b/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java similarity index 93% rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpTest.java rename to src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java index 09b79bc..e701c06 100644 --- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpTest.java +++ b/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpIT.java @@ -17,14 +17,14 @@ @RunWith( MavenJUnitTestRunner.class ) @MavenVersions( { "3.2.5" } ) -public class WagonMojoHttpTest +public class WagonMojoHttpIT { @Rule public final TestResources resources = new TestResources(); public final MavenRuntime maven; - public WagonMojoHttpTest( MavenRuntimeBuilder builder ) + public WagonMojoHttpIT( MavenRuntimeBuilder builder ) throws Exception { this.maven = builder.withCliOptions( "-B" ).build(); diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsTest.java b/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java similarity index 91% rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsTest.java rename to src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java index 1d0bdb4..a1e9e24 100644 --- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsTest.java +++ b/src/test/java/org/codehaus/mojo/wagon/WagonMojoHttpSettingsIT.java @@ -16,14 +16,14 @@ @RunWith( MavenJUnitTestRunner.class ) @MavenVersions( { "3.2.5" } ) -public class WagonMojoHttpSettingsTest +public class WagonMojoHttpSettingsIT { @Rule public final TestResources resources = new TestResources(); public final MavenRuntime maven; - public WagonMojoHttpSettingsTest( MavenRuntimeBuilder builder ) + public WagonMojoHttpSettingsIT( MavenRuntimeBuilder builder ) throws Exception { this.maven = builder.withCliOptions( "-B", "-e", "-s", "settings.xml" ).build(); diff --git a/src/test/java/org/codehaus/mojo/wagon/WagonMojoSshTest.java b/src/test/java/org/codehaus/mojo/wagon/WagonMojoSshIT.java similarity index 93% rename from src/test/java/org/codehaus/mojo/wagon/WagonMojoSshTest.java rename to src/test/java/org/codehaus/mojo/wagon/WagonMojoSshIT.java index ad771a2..a692ac0 100644 --- a/src/test/java/org/codehaus/mojo/wagon/WagonMojoSshTest.java +++ b/src/test/java/org/codehaus/mojo/wagon/WagonMojoSshIT.java @@ -17,14 +17,14 @@ @RunWith( MavenJUnitTestRunner.class ) @MavenVersions( { "3.2.5" } ) -public class WagonMojoSshTest +public class WagonMojoSshIT { @Rule public final TestResources resources = new TestResources(); public final MavenRuntime maven; - public WagonMojoSshTest( MavenRuntimeBuilder builder ) + public WagonMojoSshIT( MavenRuntimeBuilder builder ) throws Exception { this.maven = builder.withCliOptions( "-B", "-e", "-s", "settings.xml" ).build(); diff --git a/src/test/projects/ftp-basic/pom.xml b/src/test/projects/ftp-basic/pom.xml index 7d79954..19c08f1 100644 --- a/src/test/projects/ftp-basic/pom.xml +++ b/src/test/projects/ftp-basic/pom.xml @@ -41,7 +41,7 @@ download-single - WagonMojoFtpBasicTest.class + WagonMojoFtpBasicIT.class ${downloadDirectory.base} @@ -53,7 +53,7 @@ ${downloadDirectory.base}/single-dir - WagonMojoFtpBasicTest.class,WagonMojoHttpTest.class + WagonMojoFtpBasicIT.class,WagonMojoHttpTest.class @@ -73,4 +73,4 @@ - \ No newline at end of file + diff --git a/src/test/projects/http-download/pom.xml b/src/test/projects/http-download/pom.xml index 9dae79e..b0011a4 100644 --- a/src/test/projects/http-download/pom.xml +++ b/src/test/projects/http-download/pom.xml @@ -78,7 +78,7 @@ https://repo1.maven.org/maven2/commons-dbutils/commons-dbutils - 1*/** + 1.1/** 1.0/**, 1.2/**, 1.3/**, 1.4/**, 1.5/**, 1.6/** ${downloadDirectory.base}