From 3ccb51c6c35310b8a0ac7ca1a3c48ded3dfe7f05 Mon Sep 17 00:00:00 2001
From: Jason Katonica <122893202+jasonkatonica@users.noreply.github.com>
Date: Fri, 23 Aug 2024 15:20:03 -0400
Subject: [PATCH] Make use of mvn for OpenJCEPlus test execution (#5479)

* Make use of mvn for OpenJCEPlus test execution

This update allows for the test infrastructure to make use of `mvn`
directly for testing `OpenJCEPlus`. This allows for `mvn` to control
dependency usage along with using the same test infrastructure and
plugins in use within the open source project.

Signed-off-by: Jason Katonica <katonica@us.ibm.com>

* Use fully qualified names instead of PATH

---------

Signed-off-by: Jason Katonica <katonica@us.ibm.com>
---
 functional/OpenJcePlusTests/build.xml    |  47 +-------
 functional/OpenJcePlusTests/playlist.xml |  18 ++-
 functional/OpenJcePlusTests/test.xml     | 136 -----------------------
 3 files changed, 20 insertions(+), 181 deletions(-)
 delete mode 100644 functional/OpenJcePlusTests/test.xml

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index ae457f2f1f..5d0b2fea1a 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -26,7 +26,7 @@
 	<!--Properties for this particular build-->
 	<property name="src" location="./OpenJCEPlus/src/" />
 	<property name="build" location="./bin" />
-	<property name="LIB" value="junit4,hamcrest_core,bcprov_jdk18on,bcpkix-jdk18on,bcprov-ext-jdk18on,junit_vintage_engine,junit_platform_suite,junit_jupiter_api,junit_jupiter_engine,junit_jupiter_params,junit_platform_suite_api"/>
+	<property name="LIB" value="maven"/>
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
 	<property environment="env" />
 
@@ -105,52 +105,13 @@
 		<mkdir dir="${build}" />
 	</target>
 
-	<property name="addExports" value='--add-exports java.base/sun.security.internal.spec=openjceplus --add-exports java.base/sun.security.util=openjceplus,ALL-UNNAMED --add-exports java.base/sun.security.x509=openjceplus,ALL-UNNAMED --add-exports java.base/sun.security.pkcs=openjceplus,ALL-UNNAMED --add-exports java.base/sun.security.internal.interfaces=openjceplus --add-exports java.base/sun.util.logging=openjceplus --add-exports java.base/jdk.internal.logger=openjceplus --add-exports openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED --add-exports openjceplus/com.ibm.misc=ALL-UNNAMED' />
-
-	<target name="compile" depends="init,getDependentLibs,getOpenJcePlusTests" description="Using java ${JDK_VERSION} to compile the source  ">
-		<echo>Ant version is ${ant.version}</echo>
-		<echo>============COMPILER SETTINGS============</echo>
-		<echo>===fork:                         yes</echo>
-		<echo>===executable:                   ${compiler.javac}</echo>
-		<echo>===debug:                        on</echo>
-		<echo>===destdir:                      ${DEST}</echo>
-		<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
-			<compilerarg line='-Xlint:all ${addExports}' />
-			<src path="${src}" />
-			<classpath>
-				<pathelement location="${LIB_DIR}/junit4.jar" />
-				<pathelement location="${LIB_DIR}/hamcrest-core.jar" />
-				<pathelement location="${LIB_DIR}/bcprov-jdk18on.jar" />
-				<pathelement location="${LIB_DIR}/bcprov-ext-jdk18on.jar" />
-				<pathelement location="${LIB_DIR}/bcpkix-jdk18on.jar" />
-				<pathelement location="${LIB_DIR}/junit-vintage-engine.jar" />
-				<pathelement location="${LIB_DIR}/junit-platform-suite.jar" />
-				<pathelement location="${LIB_DIR}/junit-jupiter-api.jar" />
-				<pathelement location="${LIB_DIR}/junit-jupiter-engine.jar" />
-				<pathelement location="${LIB_DIR}/junit-jupiter-params.jar" />
-				<pathelement location="${LIB_DIR}/junit-platform-suite-api.jar" />
-			</classpath>
-		</javac>
+	<target name="compile" depends="init,getDependentLibs,getOpenJcePlusTests" description="Fetching dependencies and test code.">
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution">
-		<jar jarfile="${DEST}/openjceplus-tests.jar" filesonly="true">
-			<fileset dir="${build}" />
-			<fileset dir="${src}/../../" includes="*.properties,*.xml" />
-		</jar>
 		<copy todir="${DEST}">
-			<fileset dir="${src}/../../" includes="*.xml,*.mk,*.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit4.jar" />
-			<fileset dir="${LIB_DIR}/" includes="hamcrest-core.jar" />
-			<fileset dir="${LIB_DIR}/" includes="bcprov-jdk18on.jar" />
-			<fileset dir="${LIB_DIR}/" includes="bcprov-ext-jdk18on.jar" />
-			<fileset dir="${LIB_DIR}/" includes="bcpkix-jdk18on.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit-vintage-engine.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit-platform-suite.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit-jupiter-api.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit-jupiter-engine.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit-jupiter-params.jar" />
-			<fileset dir="${LIB_DIR}/" includes="junit-platform-suite-api.jar" />
+			<fileset dir="${LIB_DIR}/" includes="apache-maven-bin.tar.gz" />
+			<fileset dir="OpenJCEPlus"/>
 		</copy>
 	</target>
 
diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml
index 81d74c5b7c..5c4e5de15f 100644
--- a/functional/OpenJcePlusTests/playlist.xml
+++ b/functional/OpenJcePlusTests/playlist.xml
@@ -26,8 +26,22 @@
 			</disable>
 		</disables>
 		<command>cp -r ${TEST_RESROOT}/* ${REPORTDIR}/. ; \
-		ant -f test.xml -DTEST_JAVA=$(Q)$(JAVA_COMMAND)$(Q) launch_test; \
-	$(TEST_STATUS)</command>
+		cd ${REPORTDIR}; \
+		chmod 755 *.sh; \
+		mkdir apache-maven; \
+		tar xvzf apache-maven-bin.tar.gz -C apache-maven --strip-components 1; \
+		ls -al; \
+		${REPORTDIR}/apache-maven/bin/mvn -version; \
+		${REPORTDIR}/apache-maven/bin/mvn -f ${REPORTDIR}/pom.xml \
+		-Denforcer.skip \
+		-Dtestenvironment=standalonebundled \
+		clean \
+		test-compile \
+		surefire:test; \
+		$(TEST_STATUS); \
+		mkdir junitreports; \
+		cp -r ${REPORTDIR}/target/surefire-reports/* junitreports
+		</command>
 		<levels>
 			<level>extended</level>
 		</levels>
diff --git a/functional/OpenJcePlusTests/test.xml b/functional/OpenJcePlusTests/test.xml
deleted file mode 100644
index 856066abe2..0000000000
--- a/functional/OpenJcePlusTests/test.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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.TestMemStressAll,
-		ibm.jceplus.junit.TestMultiThread,
-		ibm.jceplus.junit.TestMultithreadFIPS,
-		ibm.jceplus.junit.TestAll.
-		</echo>
-	</target>
-
-	<target name="launch_test">
-		<echo message="Running ibm.jceplus.junit.TestMemStressAll, ibm.jceplus.junit.TestMultiThread, ibm.jceplus.junit.TestMultithreadFIP and ibm.jceplus.junit.TestAll in ${user.dir}" />
-		<mkdir dir="junitreports" />
-		<java jvm="${TEST_JAVA}"
-				classname="org.apache.tools.ant.launch.Launcher"
-				fork="true"
-				failonerror="true"
-				dir="${basedir}"
-				timeout="7200000"
-				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">
-		<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMemStressAll" />
-		<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="bcprov-ext-jdk18on.jar" />
-				<pathelement location="bcpkix-jdk18on.jar" />
-				<pathelement location="openjceplus-tests.jar" />
-				<pathelement location="junit-vintage-engine.jar" />
-				<pathelement location="junit-platform-suite.jar" />
-				<pathelement location="junit-jupiter-api.jar" />
-				<pathelement location="junit-jupiter-engine.jar" />
-				<pathelement location="junit-jupiter-params.jar" />
-				<pathelement location="junit-platform-suite-api.jar" />
-			</classpath>
-			<formatter type="xml" />
-			<test name="ibm.jceplus.junit.TestMemStressAll" todir="junitreports"/>
-		</junit>
-		<echo message="TestMemStressAll COMPLETED" />
-		<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMultiThread" />
-		<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="bcprov-ext-jdk18on.jar" />
-				<pathelement location="bcpkix-jdk18on.jar" />
-				<pathelement location="openjceplus-tests.jar" />
-				<pathelement location="junit-vintage-engine.jar" />
-				<pathelement location="junit-platform-suite.jar" />
-				<pathelement location="junit-jupiter-api.jar" />
-				<pathelement location="junit-jupiter-engine.jar" />
-				<pathelement location="junit-jupiter-params.jar" />
-				<pathelement location="junit-platform-suite-api.jar" />
-			</classpath>
-			<formatter type="xml" />
-			<test name="ibm.jceplus.junit.TestMultithread" todir="junitreports"/>
-		</junit>
-		<echo message="TestMultithread COMPLETED" />
-		<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.jar --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-exports=openjceplus/com.ibm.crypto.plus.provider.ock=ALL-UNNAMED ibm.jceplus.junit.TestMultiThreadFIPS" />
-		<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="bcprov-ext-jdk18on.jar" />
-				<pathelement location="bcpkix-jdk18on.jar" />
-				<pathelement location="openjceplus-tests.jar" />
-				<pathelement location="junit-vintage-engine.jar" />
-				<pathelement location="junit-platform-suite.jar" />
-				<pathelement location="junit-jupiter-api.jar" />
-				<pathelement location="junit-jupiter-engine.jar" />
-				<pathelement location="junit-jupiter-params.jar" />
-				<pathelement location="junit-platform-suite-api.jar" />
-			</classpath>
-			<formatter type="xml" />
-			<test name="ibm.jceplus.junit.TestMultithreadFIPS" todir="junitreports"/>
-		</junit>
-		<echo message="TestMultithreadFIPS COMPLETED" />
-		<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-jdk18on.jar:bcprov-ext-jdk18on.jar:bcpkix-jdk18on.jar:openjceplus-tests.jar:junit-vintage-engine.jar:junit-platform-suite.jar:junit-jupiter-api.jar:junit-jupiter-engine.jar:junit-jupiter-params.jar:junit-platform-suite-api.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" />
-		<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="bcprov-ext-jdk18on.jar" />
-				<pathelement location="bcpkix-jdk18on.jar" />
-				<pathelement location="openjceplus-tests.jar" />
-				<pathelement location="junit-vintage-engine.jar" />
-				<pathelement location="junit-platform-suite.jar" />
-				<pathelement location="junit-jupiter-api.jar" />
-				<pathelement location="junit-jupiter-engine.jar" />
-				<pathelement location="junit-jupiter-params.jar" />
-				<pathelement location="junit-platform-suite-api.jar" />
-			</classpath>
-			<formatter type="xml" />
-			<test name="ibm.jceplus.junit.TestAll" todir="junitreports"/>
-		</junit>
-		<echo message="TestAll COMPLETED" />
-		<echo message="ALL TESTS COMPLETED" />
-	</target>
-</project>