[incubator-kie-drools-6158] Remove remaining binaries from test resou…

…rces on main - Create TestJar.jar on the fly
apache · Nov 25, 2024 · eec4be7 · eec4be7
1 parent f990ec1
commit eec4be7
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 5 deletions.
diff --git a/.rat-excludes b/.rat-excludes
@@ -84,16 +84,22 @@ CompositeKnowledgeBuilderImpl_build.sdt
 PMMLAssemblerService_addResourceAfterRules_withoutConfigurations.sdt
 # efesto/documentation/sdt/PMMLAssemblerService_addResourcesAfterRules_withConfigurations.sdt
 PMMLAssemblerService_addResourcesAfterRules_withConfigurations.sdt
+# efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json
+IndexFile.testb_json
 # efesto/efesto-core/efesto-common-api/src/test/resources/IndexFile.test_json
 IndexFile.test_json
 # efesto/efesto-core/efesto-common-api/src/test/resources/TestingEmptyFile.txt
 TestingEmptyFile.txt
+# efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json
+IndexFile.testb_json
 # efesto/efesto-core/efesto-common-core/src/test/resources/IndexFile.test_json
 IndexFile.test_json
 # efesto/efesto-core/efesto-common-core/src/test/resources/TestingEmptyFile.txt
 TestingEmptyFile.txt
 # efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/src/test/resources/IndexFile.test_json
 IndexFile.test_json
+# efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json
+IndexFile.testb_json
 # efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/IndexFile.test_json
 IndexFile.test_json
 # kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/goal.txt

diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml
@@ -55,5 +55,28 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar destfile="${project.build.testOutputDirectory}/TestJar.jar">
+                  <fileset dir="${project.basedir}/src/test/custom-resources"/>
+                </jar>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
diff --git a/efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json b/efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json
@@ -0,0 +1,15 @@
+[
+  {
+    "step-type": "executable",
+    "modelLocalUriId": {
+      "model": "foo",
+      "basePath": "/this/is/fri",
+      "fullPath": "/foo/this/is/fri"
+    },
+    "fullClassNames": ["full.class.Name"]
+  },
+  {
+    "step-type": "class",
+    "fullClassName": "full.class.Name"
+  }
+]
diff --git a/.../efesto-common-api/src/test/java/org/kie/efesto/common/api/utils/MemoryFileUtilsTest.java b/.../efesto-common-api/src/test/java/org/kie/efesto/common/api/utils/MemoryFileUtilsTest.java
@@ -128,7 +128,7 @@ private static URL getResourceUrl() {
 
     private static URL getJarUrl() throws MalformedURLException {
         URL retrieved = Thread.currentThread().getContextClassLoader().getResource("TestJar.jar");
-        assertThat(retrieved).isNotNull();
+        assertThat(retrieved).as("Run `mvn test` to build TestJar.jar").isNotNull();
         String newString = "jar:" + retrieved + "!/IndexFile.testb_json";
         return new URL(newString);
     }

diff --git a/efesto/efesto-core/efesto-common-api/src/test/resources/TestJar.jar b/efesto/efesto-core/efesto-common-api/src/test/resources/TestJar.jar
diff --git a/efesto/efesto-core/efesto-common-core/pom.xml b/efesto/efesto-core/efesto-common-core/pom.xml
@@ -55,5 +55,27 @@
     </dependency>
   </dependencies>
 
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar destfile="${project.build.testOutputDirectory}/TestJar.jar">
+                  <fileset dir="${project.basedir}/src/test/custom-resources"/>
+                </jar>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json b/efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json
@@ -0,0 +1,15 @@
+[
+  {
+    "step-type": "executable",
+    "modelLocalUriId": {
+      "model": "foo",
+      "basePath": "/this/is/fri",
+      "fullPath": "/foo/this/is/fri"
+    },
+    "fullClassNames": ["full.class.Name"]
+  },
+  {
+    "step-type": "class",
+    "fullClassName": "full.class.Name"
+  }
+]
diff --git a/...core/efesto-common-core/src/test/java/org/kie/efesto/common/core/utils/JSONUtilsTest.java b/...core/efesto-common-core/src/test/java/org/kie/efesto/common/core/utils/JSONUtilsTest.java
@@ -201,7 +201,7 @@ void getModelLocalUriIdObject() throws JsonProcessingException {
     private ClassLoader addJarToClassLoader() {
         ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
         URL jarUrl = Thread.currentThread().getContextClassLoader().getResource("TestJar.jar");
-        assertThat(jarUrl).isNotNull();
+        assertThat(jarUrl).as("Run `mvn test` to build TestJar.jar").isNotNull();
         URL fileUrl = Thread.currentThread().getContextClassLoader().getResource("IndexFile.testb_json");
         assertThat(fileUrl).isNull();
         URL[] urls = {jarUrl};

diff --git a/efesto/efesto-core/efesto-common-core/src/test/resources/TestJar.jar b/efesto/efesto-core/efesto-common-core/src/test/resources/TestJar.jar
diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/pom.xml
@@ -49,5 +49,27 @@
     </dependency>
   </dependencies>
 
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar destfile="${project.build.testOutputDirectory}/TestJar.jar">
+                  <fileset dir="${project.basedir}/src/test/custom-resources"/>
+                </jar>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/...untime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json b/...untime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json
@@ -0,0 +1,20 @@
+[
+  {
+    "step-type": "executable",
+    "modelLocalUriId": {
+      "model": "testb",
+      "basePath": "/testmod",
+      "fullPath": "/testb/testmod"
+    },
+    "fullClassNames": [""]
+  },
+  {
+    "step-type": "redirect",
+    "modelLocalUriId": {
+      "model": "testb",
+      "basePath": "/redirecttestmod",
+      "fullPath": "/testb/redirecttestmod"
+    },
+    "target": "other"
+  }
+]
diff --git a/...re/src/test/java/org/kie/efesto/runtimemanager/core/utils/GeneratedResourceUtilsTest.java b/...re/src/test/java/org/kie/efesto/runtimemanager/core/utils/GeneratedResourceUtilsTest.java
@@ -75,7 +75,7 @@ void getGeneratedRedirectResourceFromJar() {
     private ClassLoader addJarToClassLoader() {
         ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
         URL jarUrl = Thread.currentThread().getContextClassLoader().getResource("TestJar.jar");
-        assertThat(jarUrl).isNotNull();
+        assertThat(jarUrl).as("Run `mvn test` to build TestJar.jar").isNotNull();
         URL fileUrl = Thread.currentThread().getContextClassLoader().getResource("IndexFile.testb_json");
         assertThat(fileUrl).isNull();
         URL[] urls = {jarUrl};

diff --git a/...to-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/TestJar.jar b/...to-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/TestJar.jar