SHRINKRES-355 - Fix artifact selection in EmbeddedGradleImporter and add test for it.

Author: xjusko

gradle/impl-gradle-embedded-archive/src/it/multiple-artifacts-sample/build.gradle

@@ -0,0 +1,23 @@
+apply plugin: 'war'
+apply plugin: 'java'
+
+group = 'org.jboss.shrinkwrap.resolver.test'
+version = '1.0.0'
+description = "ShrinkWrap Resolver Gradle Test: Ambiguous Sample (JAR + WAR)"
+
+repositories {
+    mavenCentral()
+}
+
+// Minimal dependencies
+dependencies {
+    testImplementation group: 'junit', name: 'junit', version: '4.12'
+}
+
+// Force generation of the JAR to create the ambiguity (JAR vs WAR)
+jar {
+    enabled = true
+}
+
+// Ensure JAR is built alongside the WAR
+assemble.dependsOn jar

gradle/impl-gradle-embedded-archive/src/it/multiple-artifacts-sample/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,3 @@
+<web-app>
+   <distributable/>
+</web-app>

gradle/impl-gradle-embedded-archive/src/main/java/org/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/EmbeddedGradleImporterImpl.java

@@ -32,6 +32,10 @@
 import org.jboss.shrinkwrap.api.gradle.archive.importer.embedded.DistributionConfigurationStage;
 import org.jboss.shrinkwrap.api.gradle.archive.importer.embedded.EmbeddedGradleImporter;
 import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.impl.base.Validate;
 
 /**
@@ -100,14 +104,14 @@ public DistributionConfigurationStage forThisProjectDirectory() {
     public <TYPE extends Assignable> TYPE as(final Class<TYPE> clazz) {
         final File result;
         if (buildResult == null) {
-            result = importFromDefaultLibsDirectory();
+            result = importFromDefaultLibsDirectory(clazz);
         } else {
             result = importFromConfiguredPath();
         }
         return ShrinkWrap.create(ZipImporter.class, archive.getName()).importFrom(result).as(clazz);
     }
 
-    private File importFromDefaultLibsDirectory() {
+    private File importFromDefaultLibsDirectory(final Class<? extends Assignable> clazz) {
         final GradleProject currentGradleProject = findCurrentGradleProject();
         final File buildDir = currentGradleProject.getBuildDirectory();
         final File libsDir = new File(buildDir, "libs");
@@ -118,6 +122,27 @@ private File importFromDefaultLibsDirectory() {
                 "Wrong project directory is used. Tests have to be run from working directory which is a current sub-module directory.");
         }
 
+        final String requiredExtension;
+        if (WebArchive.class.isAssignableFrom(clazz)) {
+            requiredExtension = ".war";
+        } else if (EnterpriseArchive.class.isAssignableFrom(clazz)) {
+            requiredExtension = ".ear";
+        } else if (ResourceAdapterArchive.class.isAssignableFrom(clazz)) {
+            requiredExtension = ".rar";
+        } else if (JavaArchive.class.isAssignableFrom(clazz)) {
+            requiredExtension = ".jar";
+        } else {
+            requiredExtension = null;
+        }
+
+        if (requiredExtension != null) {
+            for (File file : results) {
+                if (file.getName().endsWith(requiredExtension)) {
+                    return file;
+                }
+            }
+        }
+
         return results[0];
     }
 

gradle/impl-gradle-embedded-archive/src/test/java/org/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/MultipleArtifactsEmbeddedGradleImporterTestCase.java

@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.shrinkwrap.impl.gradle.archive.importer.embedded;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.gradle.archive.importer.embedded.EmbeddedGradleImporter;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Regression test for SHRINKRES-355.
+ * Verifies that the importer picks the correct artifact (.war) even when a .jar is present.
+ */
+public class MultipleArtifactsEmbeddedGradleImporterTestCase {
+
+    @Test
+    void shouldImportWarWhenJarIsAlsoPresent() {
+        final String dir = "src/it/multiple-artifacts-sample/";
+
+        final WebArchive webArchive = ShrinkWrap.create(EmbeddedGradleImporter.class)
+                .forProjectDirectory(dir)
+                .importBuildOutput()
+                .as(WebArchive.class);
+
+        // DEBUG PRINT to see what's inside
+        System.out.println("ARCHIVE CONTENT:\n" + webArchive.toString(true));
+
+        // CORRECT ASSERTION:
+        // A WAR file must contain the WEB-INF directory.
+        // A JAR file (which is the wrong file) will NOT contain WEB-INF.
+        assertThat(webArchive.contains("WEB-INF"))
+                .as("The imported archive should be a WAR and contain WEB-INF")
+                .isTrue();
+    }
+}

gradle/impl-gradle-embedded-archive/src/test/java/org/jboss/shrinkwrap/impl/gradle/archive/importer/embedded/WarEmbeddedGradleImporterTestCase.java

@@ -41,6 +41,5 @@ void should() {
         AssertArchive.assertContains(webArchive, "WEB-INF/classes/main.properties");
         AssertArchive.assertContains(webArchive, "WEB-INF/web.xml");
         AssertArchive.assertNotContains(webArchive, "file.toExclude");
-        assertThat(webArchive.getContent().size()).isEqualTo(12);
-    }
+        assertThat(webArchive.getContent().size()).isEqualTo(12);}
 }