You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/04/16 10:43:25 UTC

[maven-ear-plugin] 15/24: Recordered test methods.

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch itf-extension
in repository https://gitbox.apache.org/repos/asf/maven-ear-plugin.git

commit 1bc7378b5683c843021e4d9b70e2cb241a02f5ce
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Nov 10 22:05:02 2019 +0100

    Recordered test methods.
---
 .../org/apache/maven/plugins/ear/it/EARIT.java     | 59 ++++++++++------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java b/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
index ba01079..4eb46c1 100644
--- a/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
+++ b/src/test/java/org/apache/maven/plugins/ear/it/EARIT.java
@@ -20,9 +20,7 @@ package org.apache.maven.plugins.ear.it;
  */
 
 import static org.apache.maven.jupiter.assertj.MavenITAssertions.assertThat;
-import static org.apache.maven.jupiter.extension.maven.MavenVersion.M3_6_2;
 
-import org.apache.maven.jupiter.extension.DisabledForMaven;
 import org.apache.maven.jupiter.extension.MavenIT;
 import org.apache.maven.jupiter.extension.MavenTest;
 import org.apache.maven.jupiter.extension.maven.MavenExecutionResult;
@@ -38,16 +36,14 @@ import org.junit.jupiter.api.DisplayName;
  *   <li>resource_custom_directory</li>
  * </ul>
  *
- * @author Karl Heinz Marbaise
- * These are the maven-invoker-plugin integration tests (src/it/**).
- * migrated to the new maven-it-extension
+ * @author Karl Heinz Marbaise These are the maven-invoker-plugin integration tests (src/it/**). migrated to the new
+ * maven-it-extension
  */
 @MavenIT
 @DisplayName("EAR Plugin Integration tests")
 class EARIT {
 
   @MavenTest
-  @DisabledForMaven(M3_6_2)
   @DisplayName("Basic configuration. Should simply create an ear file.")
   void basic(MavenExecutionResult result, MavenProjectResult project) {
     assertThat(result).isSuccessful();
@@ -56,14 +52,27 @@ class EARIT {
         .containsOnlyOnce("META-INF/application.xml", "META-INF/appserver-application.xml");
   }
 
+  /*
+Archive:  test-1.0.ear
+  testing: META-INF/MANIFEST.MF     OK
+  testing: META-INF/                OK
+  testing: META-INF/maven/          OK
+  testing: META-INF/maven/org.apache.maven.its.ear.jboss/   OK
+  testing: META-INF/maven/org.apache.maven.its.ear.jboss/test/   OK
+  testing: META-INF/application.xml   OK
+  testing: META-INF/jboss-app.xml   OK
+  testing: META-INF/appserver-application.xml   OK
+  testing: META-INF/maven/org.apache.maven.its.ear.jboss/test/pom.xml   OK
+  testing: META-INF/maven/org.apache.maven.its.ear.jboss/test/pom.properties   OK
+ */
   @MavenTest
-  @DisplayName("Packging includes defined.")
-  void packaging_includes(MavenExecutionResult result, MavenProjectResult project) {
+  @DisplayName("JBoss app generation in EAR file.")
+  void jboss(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
     assertThat(result).isSuccessful();
+    assertThat(log).isSuccessful();
     assertThat(project).hasTarget()
         .withEarFile()
-        .doesNotContain("commons-io-1.4.jar")
-        .containsOnlyOnce("commons-lang-commons-lang-2.5.jar", "META-INF/application.xml", "META-INF/MANIFEST.MF");
+        .containsOnlyOnce("META-INF/application.xml", "META-INF/appserver-application.xml", "META-INF/jboss-app.xml");
   }
 
   @MavenTest
@@ -77,39 +86,25 @@ class EARIT {
   }
 
   @MavenTest
-  @DisplayName("Filtering of a custom directory (likely wrong!)")
-  void resource_custom_directory(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
+  @DisplayName("Packging includes defined.")
+  void packaging_includes(MavenExecutionResult result, MavenProjectResult project) {
     assertThat(result).isSuccessful();
-    assertThat(log).isSuccessful();
     assertThat(project).hasTarget()
         .withEarFile()
-        .containsOnlyOnce("META-INF/application.xml", "APP-INF/classes/foo.properties");
+        .doesNotContain("commons-io-1.4.jar")
+        .containsOnlyOnce("commons-lang-commons-lang-2.5.jar", "META-INF/application.xml", "META-INF/MANIFEST.MF");
   }
 
-  /*
-  Archive:  test-1.0.ear
-    testing: META-INF/MANIFEST.MF     OK
-    testing: META-INF/                OK
-    testing: META-INF/maven/          OK
-    testing: META-INF/maven/org.apache.maven.its.ear.jboss/   OK
-    testing: META-INF/maven/org.apache.maven.its.ear.jboss/test/   OK
-    testing: META-INF/application.xml   OK
-    testing: META-INF/jboss-app.xml   OK
-    testing: META-INF/appserver-application.xml   OK
-    testing: META-INF/maven/org.apache.maven.its.ear.jboss/test/pom.xml   OK
-    testing: META-INF/maven/org.apache.maven.its.ear.jboss/test/pom.properties   OK
-   */
   @MavenTest
-  @DisplayName("JBoss app generation in EAR file.")
-  void jboss(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
+  @DisplayName("Filtering of a custom directory (likely wrong!)")
+  void resource_custom_directory(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {
     assertThat(result).isSuccessful();
     assertThat(log).isSuccessful();
     assertThat(project).hasTarget()
         .withEarFile()
-        .containsOnlyOnce("META-INF/application.xml",
-            "META-INF/appserver-application.xml",
-            "META-INF/jboss-app.xml");
+        .containsOnlyOnce("META-INF/application.xml", "APP-INF/classes/foo.properties");
   }
+
   @MavenTest
   @DisplayName("Transitive excludes")
   void transitive_excludes(MavenExecutionResult result, MavenProjectResult project, MavenLog log) {