From 9691d589d99769f2ce17feb65def69640e72621b Mon Sep 17 00:00:00 2001
From: Lan Xia <Lan_Xia@ca.ibm.com>
Date: Mon, 5 Feb 2024 17:15:03 -0500
Subject: [PATCH] Generate junit xml in OpenJcePlusTests (#5036)

Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>
---
 functional/OpenJcePlusTests/build.xml    |  3 ++
 functional/OpenJcePlusTests/playlist.xml |  6 +--
 functional/OpenJcePlusTests/test.xml     | 58 ++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 functional/OpenJcePlusTests/test.xml

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index 940596f822..b48a4f46b6 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -84,6 +84,9 @@
 		</jar>
 		<copy todir="${DEST}">
 			<fileset dir="${src}/../../" includes="*.xml,*.mk" />
+			<fileset dir="${LIB_DIR}/" includes="junit4.jar" />
+			<fileset dir="${LIB_DIR}/" includes="hamcrest-core.jar" />
+			<fileset dir="${LIB_DIR}/" includes="bcprov-jdk18on.jar" />
 		</copy>
 	</target>
 
diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml
index a4e587ed44..20f3001711 100644
--- a/functional/OpenJcePlusTests/playlist.xml
+++ b/functional/OpenJcePlusTests/playlist.xml
@@ -25,11 +25,7 @@
 				<platform>^((?!(ppc64_aix|ppc64le_linux|x86-64_linux|x86-64_windows)).)*$</platform>
 			</disable>
 		</disables>
-		<command>$(JAVA_COMMAND) $(JVM_OPTIONS) \
-	-cp $(Q)$(LIB_DIR)$(D)junit4.jar$(P)$(LIB_DIR)$(D)hamcrest-core.jar$(P)$(LIB_DIR)$(D)bcprov-jdk18on.jar$(P)$(TEST_RESROOT)$(D)openjceplus-tests.jar$(Q) \
-	--add-exports=java.base/sun.security.util=ALL-UNNAMED \
-	--add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED \
-	ibm.jceplus.junit.TestAll; \
+		<command>ant -f ${BUILD_ROOT}/functional/OpenJcePlusTests/test.xml -DTEST_JAVA=$(Q)$(JAVA_COMMAND)$(Q) launch_test; \
 	$(TEST_STATUS)</command>
 		<levels>
 			<level>extended</level>
diff --git a/functional/OpenJcePlusTests/test.xml b/functional/OpenJcePlusTests/test.xml
new file mode 100644
index 0000000000..ea60f40287
--- /dev/null
+++ b/functional/OpenJcePlusTests/test.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!--
+# 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
+#
+#      https://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.
+-->
+
+<project name="Launcher script for OpenJcePlusTests" default="help" basedir=".">
+	<target name="help">
+		<echo>Ant script to run the tests for ibm.jceplus.junit.TestAll.
+		</echo>
+	</target>
+
+	<target name="launch_test">
+		<echo message="Running ibm.jceplus.junit.TestAll in ${user.dir}" />
+		<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:openjceplus-tests.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestAll" />
+		<mkdir dir="junitreports" />
+		<java jvm="${TEST_JAVA}"
+				classname="org.apache.tools.ant.launch.Launcher"
+				fork="true"
+				failonerror="true"
+				dir="${basedir}"
+				timeout="3600000"
+				taskname="test">
+			<classpath>
+				<pathelement location="${ant.home}/lib/ant-launcher.jar" />
+			</classpath>
+			<jvmarg value="-showversion" />
+			<arg value="-buildfile" />
+			<arg file="${ant.file}" />
+			<arg value="test" />
+		</java>
+	</target>
+	<target name="test">
+		<junit fork="yes" printsummary="on" showoutput="yes" haltonfailure="yes">
+			<jvmarg line="--add-exports=java.base/sun.security.util=ALL-UNNAMED" />
+			<jvmarg line="--add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED" />
+			<classpath>
+				<pathelement location="junit4.jar" />
+				<pathelement location="hamcrest-core.jar" />
+				<pathelement location="bcprov-jdk18on.jar" />
+				<pathelement location="openjceplus-tests.jar" />
+			</classpath>
+			<formatter type="xml" />
+			<test name="ibm.jceplus.junit.TestAll" todir="junitreports"/>
+		</junit>
+		<echo message="ALL TESTS COMPLETED" />
+	</target>
+</project>