Fixed #96 - Improve usage of ITF

asciidoctor-lifecycle-maven · Oct 27, 2020 · 9495176 · 9495176
1 parent 41e7199
commit 9495176
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 139 deletions.
diff --git a/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/CopySourcesIT.java b/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/CopySourcesIT.java
@@ -1,27 +1,21 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
 import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
+
+import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
 
 @MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
+@MavenGoal( "clean" )
+@MavenGoal( "asciidoctor-prepare-resources" )
+@MavenDebug
 public class CopySourcesIT {
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-prepare-resources" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
     public void missingBuildDirectory( MavenExecutionResult result )
     throws Exception {
         assertThat( result )
@@ -33,10 +27,6 @@ public void missingBuildDirectory( MavenExecutionResult result )
     }
 
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-prepare-resources" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
     public void missingSourceDirectory( MavenExecutionResult result )
     throws Exception {
         final ProjectValidator validator = new ProjectValidator( result );

diff --git a/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PhasesIT.java b/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PhasesIT.java
@@ -1,26 +1,20 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
 import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
 
 @MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
+@MavenDebug
 public class PhasesIT {
 
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-pre-convert" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
     public void prepareConvertGoal( MavenExecutionResult result )
     throws Exception {
         final ProjectValidator validator = new ProjectValidator( result );
@@ -35,8 +29,6 @@ public void prepareConvertGoal( MavenExecutionResult result )
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-convert" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
     public void convertGoal( final MavenExecutionResult result )
     throws Exception {
         final ProjectValidator validator = new ProjectValidator( result );
@@ -52,8 +44,6 @@ public void convertGoal( final MavenExecutionResult result )
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "package" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
     public void packageGoal( final MavenExecutionResult result )
     throws Exception {
         final ProjectValidator validator = new ProjectValidator( result );

diff --git a/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToDirectoryIT.java b/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToDirectoryIT.java
@@ -1,28 +1,23 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
-import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.extension.SystemProperty;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+
+import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
 
-@MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
+@MavenGoal("clean")
+@MavenGoal("asciidoctor-publish")
+@MavenDebug
 public class PublishToDirectoryIT
 extends AbstractPublishMojoIT {
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( MavenCLIOptions.DEBUG )
     @SystemProperty( value = "subdirectory.name", content = "publishToDirectory" )
     @Execution( ExecutionMode.CONCURRENT )
     public void publishToDirectory( final MavenExecutionResult result )
@@ -36,9 +31,6 @@ public void publishToDirectory( final MavenExecutionResult result )
     }
 
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( MavenCLIOptions.DEBUG )
     @SystemProperty( value = "subdirectory.name", content = "inputDirectoryDoesNotExists" )
     @Execution( ExecutionMode.CONCURRENT )
     public void inputDirectoryDoesNotExists( final MavenExecutionResult result ) {

diff --git a/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToHttpsIT.java b/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToHttpsIT.java
@@ -1,23 +1,18 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
 
+import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
+
 public class PublishToHttpsIT
 extends AbstractPublishMojoIT {
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
+    @MavenDebug
     public void wagonDoesNotSupportDirectCopy( final MavenExecutionResult result ) {
         assertThat( result )
             .isFailure()

diff --git a/...a/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToUnsupportedProtocolsIT.java b/...a/com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToUnsupportedProtocolsIT.java
@@ -1,23 +1,18 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
 
+import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
+
 public class PublishToUnsupportedProtocolsIT
 extends AbstractPublishMojoIT {
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( MavenCLIOptions.DEBUG )
-    @Execution( ExecutionMode.CONCURRENT )
+    @MavenDebug
     public void publishToSamba( final MavenExecutionResult result ) {
         assertThat( result )
             .isFailure()

diff --git a/.../com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToWebdavWithCredentialsIT.java b/.../com/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToWebdavWithCredentialsIT.java
@@ -1,29 +1,25 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
 import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
 import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
 import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.extension.SystemProperty;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
 
 @MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
 public class PublishToWebdavWithCredentialsIT
 extends AbstractWebdavPublishMojoIT {
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( "--settings=src/test/resources/settings.xml" )
-    @MavenOption( MavenCLIOptions.DEBUG )
+    @MavenOption( value = MavenCLIOptions.SETTINGS, parameter = "src/test/resources/settings.xml" )
+    @MavenDebug
     @SystemProperty( value = "webdav.server.port", content = "" + WebDavConstants.PUBLISH_WITH_CREDENTIALS_PORT )
-    @Execution( ExecutionMode.CONCURRENT )
     public void publishWithCredentials( final MavenExecutionResult result ) {
         final ProjectValidator validator = new ProjectValidator( result, this.getRootFolder() );
         final SoftAssertions assertions = new SoftAssertions();

diff --git a/...coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToWebdavWithWrongCredentialsIT.java b/...coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToWebdavWithWrongCredentialsIT.java
@@ -1,31 +1,27 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
 import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
 import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
 import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.extension.SystemProperty;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
+
+import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
 
 @MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
 public class PublishToWebdavWithWrongCredentialsIT
 extends AbstractWebdavPublishMojoIT {
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( "--settings=src/test/resources/settings.xml" )
-    @MavenOption( MavenCLIOptions.DEBUG )
+    @MavenOption( value = MavenCLIOptions.SETTINGS, parameter = "src/test/resources/settings.xml" )
+    @MavenDebug
     @SystemProperty( value = "webdav.server.port", content = "" + WebDavConstants.PUBLISH_WITH_WRONG_CREDENTIALS_PORT )
-    @Execution( ExecutionMode.CONCURRENT )
     public void publishWithWrongCredentials( final MavenExecutionResult result ) {
         final ProjectValidator validator = new ProjectValidator( result, this.getRootFolder() );
         final SoftAssertions assertions = new SoftAssertions();

diff --git a/...m/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToWebdavWithoutCredentialsIT.java b/...m/coutemeier/maven/plugins/asciidoctor/lifecycle/PublishToWebdavWithoutCredentialsIT.java
@@ -1,28 +1,22 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
 import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.extension.SystemProperty;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
 
 @MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
 public class PublishToWebdavWithoutCredentialsIT
 extends AbstractWebdavPublishMojoIT {
     @MavenTest
     @MavenGoal( "clean" )
     @MavenGoal( "asciidoctor-publish" )
-    @MavenOption( MavenCLIOptions.DEBUG )
+    @MavenDebug
     @SystemProperty( value = "webdav.server.port", content = "" + WebDavConstants.PUBLISH_WITHOUT_CREDENTIALS_PORT )
-    @Execution( ExecutionMode.CONCURRENT )
     public void publish( final MavenExecutionResult result ) {
         final ProjectValidator validator = new ProjectValidator( result, this.getRootFolder() );
         final SoftAssertions assertions = new SoftAssertions();

diff --git a/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/SkipParameterIT.java b/src/test/java/com/coutemeier/maven/plugins/asciidoctor/lifecycle/SkipParameterIT.java
@@ -1,31 +1,25 @@
 package com.coutemeier.maven.plugins.asciidoctor.lifecycle;
 
-import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
-
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
-
 import com.coutemeier.maven.plugins.asciidoctor.lifecycle.vo.ProjectValidator;
-import com.soebes.itf.jupiter.extension.MavenCLIOptions;
+import com.soebes.itf.jupiter.extension.MavenDebug;
 import com.soebes.itf.jupiter.extension.MavenGoal;
 import com.soebes.itf.jupiter.extension.MavenJupiterExtension;
-import com.soebes.itf.jupiter.extension.MavenOption;
 import com.soebes.itf.jupiter.extension.MavenTest;
 import com.soebes.itf.jupiter.extension.SystemProperty;
 import com.soebes.itf.jupiter.maven.MavenExecutionResult;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.DisplayName;
+
+import static com.soebes.itf.extension.assertj.MavenITAssertions.assertThat;
 
 @MavenJupiterExtension
-@Execution( ExecutionMode.CONCURRENT )
+@MavenGoal("clean")
+@MavenGoal("asciidoctor-convert")
+@MavenDebug
 public class SkipParameterIT {
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-convert" )
-    @MavenOption( MavenCLIOptions.DEBUG )
     @SystemProperty( value="asciidoctor.skip", content="true" )
     @DisplayName( "asciidoctor.skip=true" )
-    @Execution( ExecutionMode.CONCURRENT )
     public void skipTrue( MavenExecutionResult result )
     throws Exception {
         assertThat( result )
@@ -42,12 +36,8 @@ public void skipTrue( MavenExecutionResult result )
     }
 
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-convert" )
-    @MavenOption( MavenCLIOptions.DEBUG )
     @SystemProperty( value="asciidoctor.skip", content="false" )
     @DisplayName( "asciidoctor.skip=false" )
-    @Execution( ExecutionMode.CONCURRENT )
     public void skipFalse( MavenExecutionResult result )
     throws Exception {
         assertThat( result )
@@ -64,11 +54,7 @@ public void skipFalse( MavenExecutionResult result )
     }
 
     @MavenTest
-    @MavenGoal( "clean" )
-    @MavenGoal( "asciidoctor-convert" )
-    @MavenOption( MavenCLIOptions.DEBUG )
     @DisplayName( "asciidoctor.skip absent" )
-    @Execution( ExecutionMode.CONCURRENT )
     public void skipMissing( MavenExecutionResult result )
     throws Exception {
         assertThat( result )