From ffed9698e5963cf6e7f09a9737c557ee4ee8c3d8 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Fri, 9 Jun 2023 18:04:53 +0200
Subject: [PATCH] [MWAR-465] Rename empty test classes to clazz

Such empty classes are analyzed by dependency:analyze and cause to fail it.
---
 .../plugins/war/AbstractWarMojoTest.java      | 14 ++++----
 .../plugins/war/WarExplodedMojoTest.java      |  2 +-
 .../apache/maven/plugins/war/WarMojoTest.java |  4 +--
 .../maven/plugins/war/WarOverlaysTest.java    | 36 +++++++++----------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
index 23053c72..bbc2556e 100644
--- a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
@@ -157,7 +157,7 @@ protected File createClassesDir(String id, boolean empty) throws Exception {
         createDir(classesDir);
 
         if (!empty) {
-            createFile(new File(classesDir + "/sample-servlet.class"));
+            createFile(new File(classesDir + "/sample-servlet.clazz"));
         }
 
         return classesDir;
@@ -202,9 +202,9 @@ protected void createFile(File testFile) throws Exception {
      * <ul>
      * <li>classes
      * <ul>
-     * <li>a.class</li>
-     * <li>b.class</li>
-     * <li>c.class</li>
+     * <li>a.clazz</li>
+     * <li>b.clazz</li>
+     * <li>c.clazz</li>
      * </ul>
      * </li>
      * <li>lib
@@ -240,9 +240,9 @@ protected File generateFullOverlayWar(String id) throws Exception {
             "jsp/a.jsp",
             "jsp/b.jsp",
             "jsp/c.jsp",
-            "WEB-INF/classes/a.class",
-            "WEB-INF/classes/b.class",
-            "WEB-INF/classes/c.class",
+            "WEB-INF/classes/a.clazz",
+            "WEB-INF/classes/b.clazz",
+            "WEB-INF/classes/c.clazz",
             "WEB-INF/lib/a.jar",
             "WEB-INF/lib/b.jar",
             "WEB-INF/lib/c.jar",
diff --git a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
index 04352699..f00a7ec0 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
@@ -766,7 +766,7 @@ public void testExplodedWar_WithClasses() throws Exception {
         File expectedWebSourceFile = new File(webAppDirectory, "pansit.jsp");
         File expectedWebSource2File = new File(webAppDirectory, "org/web/app/last-exile.jsp");
         // final name form is <artifactId>-<version>.<type>
-        File expectedClass = new File(webAppDirectory, "WEB-INF/classes/sample-servlet.class");
+        File expectedClass = new File(webAppDirectory, "WEB-INF/classes/sample-servlet.clazz");
 
         assertTrue("source files not found: " + expectedWebSourceFile.toString(), expectedWebSourceFile.exists());
         assertTrue("source files not found: " + expectedWebSource2File.toString(), expectedWebSource2File.exists());
diff --git a/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
index 597e29a2..8577299b 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
@@ -474,7 +474,7 @@ public void testAttachClasses() throws Exception {
         // validate jar file
         File expectedJarFile = new File(outputDir, "simple-classes.jar");
         assertJarContent(
-                expectedJarFile, new String[] {"META-INF/MANIFEST.MF", "sample-servlet.class"}, new String[] {null, null
+                expectedJarFile, new String[] {"META-INF/MANIFEST.MF", "sample-servlet.clazz"}, new String[] {null, null
                 });
     }
 
@@ -502,7 +502,7 @@ public void testAttachClassesWithCustomClassifier() throws Exception {
         // validate jar file
         File expectedJarFile = new File(outputDir, "simple-mystuff.jar");
         assertJarContent(
-                expectedJarFile, new String[] {"META-INF/MANIFEST.MF", "sample-servlet.class"}, new String[] {null, null
+                expectedJarFile, new String[] {"META-INF/MANIFEST.MF", "sample-servlet.clazz"}, new String[] {null, null
                 });
     }
 
diff --git a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
index 5d7f17c7..c049947b 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
@@ -246,9 +246,9 @@ private void assertScenariOne(String testId, File webAppDirectory) throws Except
                         "jsp/d/b.jsp",
                         "jsp/d/c.jsp",
                         "org/sample/company/test.jsp",
-                        "WEB-INF/classes/a.class",
-                        "WEB-INF/classes/b.class",
-                        "WEB-INF/classes/c.class",
+                        "WEB-INF/classes/a.clazz",
+                        "WEB-INF/classes/b.clazz",
+                        "WEB-INF/classes/c.clazz",
                         "WEB-INF/lib/a.jar",
                         "WEB-INF/lib/b.jar",
                         "WEB-INF/lib/c.jar"
@@ -266,9 +266,9 @@ private void assertScenariOne(String testId, File webAppDirectory) throws Except
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "jsp/d/b.jsp");
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "jsp/d/c.jsp");
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/web.xml");
-            assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/classes/a.class");
-            assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/classes/b.class");
-            assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/classes/c.class");
+            assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/classes/a.clazz");
+            assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/classes/b.clazz");
+            assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/classes/c.clazz");
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/lib/a.jar");
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/lib/b.jar");
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "WEB-INF/lib/c.jar");
@@ -327,9 +327,9 @@ public void testOverlaysIncludesExcludesWithMultipleDefinitions() throws Excepti
                         "jsp/d/b.jsp",
                         "jsp/d/c.jsp",
                         "org/sample/company/test.jsp",
-                        "WEB-INF/classes/a.class",
-                        "WEB-INF/classes/b.class",
-                        "WEB-INF/classes/c.class",
+                        "WEB-INF/classes/a.clazz",
+                        "WEB-INF/classes/b.clazz",
+                        "WEB-INF/classes/c.clazz",
                         "WEB-INF/lib/a.jar",
                         "WEB-INF/lib/b.jar",
                         "WEB-INF/lib/c.jar"
@@ -344,9 +344,9 @@ public void testOverlaysIncludesExcludesWithMultipleDefinitions() throws Excepti
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "jsp/d/c.jsp");
             assertDefaultFileContent(testId, webAppDirectory, "org/sample/company/test.jsp");
             assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/web.xml");
-            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/a.class");
-            assertOverlayedFile(webAppDirectory, "overlay-full-3", "WEB-INF/classes/b.class");
-            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/c.class");
+            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/a.clazz");
+            assertOverlayedFile(webAppDirectory, "overlay-full-3", "WEB-INF/classes/b.clazz");
+            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/c.clazz");
             assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/lib/a.jar");
             assertOverlayedFile(webAppDirectory, "overlay-full-3", "WEB-INF/lib/b.jar");
             assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/lib/c.jar");
@@ -406,9 +406,9 @@ public void testOverlaysIncludesExcludesWithMultipleDefinitions2() throws Except
                         "jsp/d/b.jsp",
                         "jsp/d/c.jsp",
                         "org/sample/company/test.jsp",
-                        "WEB-INF/classes/a.class",
-                        "WEB-INF/classes/b.class",
-                        "WEB-INF/classes/c.class",
+                        "WEB-INF/classes/a.clazz",
+                        "WEB-INF/classes/b.clazz",
+                        "WEB-INF/classes/c.clazz",
                         "WEB-INF/lib/a.jar",
                         "WEB-INF/lib/b.jar",
                         "WEB-INF/lib/c.jar"
@@ -423,9 +423,9 @@ public void testOverlaysIncludesExcludesWithMultipleDefinitions2() throws Except
             assertOverlayedFile(webAppDirectory, "overlay-full-1", "jsp/d/c.jsp");
             assertDefaultFileContent(testId, webAppDirectory, "org/sample/company/test.jsp");
             assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/web.xml");
-            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/a.class");
-            assertOverlayedFile(webAppDirectory, "overlay-full-3", "WEB-INF/classes/b.class");
-            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/c.class");
+            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/a.clazz");
+            assertOverlayedFile(webAppDirectory, "overlay-full-3", "WEB-INF/classes/b.clazz");
+            assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/classes/c.clazz");
             assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/lib/a.jar");
             assertOverlayedFile(webAppDirectory, "overlay-full-3", "WEB-INF/lib/b.jar");
             assertOverlayedFile(webAppDirectory, "overlay-full-2", "WEB-INF/lib/c.jar");