From bd69eb5bdc945c6057eeca792f8ae2ecf8af5b9c Mon Sep 17 00:00:00 2001
From: Anna Babu Palathingal <148897727+annaibm@users.noreply.github.com>
Date: Mon, 30 Sep 2024 09:26:57 -0400
Subject: [PATCH] Enable OpenJcePlusTests for FIPS140-3 (#5638)

- Enable if the check for TEST_FLAG contains FIPS140_3_OpenJCEPlusFIPS.
- Added feature tags into playlist as required feature.
- Required feature Option cannot be used with other feature options

related:https://github.ibm.com/runtimes/backlog/issues/1525

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
---
 functional/OpenJcePlusTests/build.xml    | 34 +++++++++++-------------
 functional/OpenJcePlusTests/playlist.xml |  3 ++-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index a733b218ab..651c596f66 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -120,29 +120,27 @@
 		<delete dir="${build}" />
 	</target>
 
-	<target name="build" >
+	<target name="build">
 		<if>
-			<or>
+			<and>
 				<contains string="${TEST_FLAG}" substring="FIPS140_3_OpenJCEPlusFIPS"/>
-				<and>
-					<equals arg1="${JDK_VENDOR}" arg2="ibm" />
-					<equals arg1="${JDK_IMPL}" arg2="openj9" />
-					<not>
-						<matches string="${JDK_VERSION}" pattern="^(8)$$" />
-					</not>
-					<or>
-						<contains string="${SPEC}" substring="aix_ppc-64"/>
-						<contains string="${SPEC}" substring="linux_ppc-64_le"/>
-						<contains string="${SPEC}" substring="linux_x86-64"/>
-						<contains string="${SPEC}" substring="win_x86-64"/>
-						<contains string="${SPEC}" substring="linux_390-64"/>
-					</or>
-				</and>
-			</or>
+				<equals arg1="${JDK_VENDOR}" arg2="ibm" />
+				<equals arg1="${JDK_IMPL}" arg2="openj9" />
+				<not>
+					<matches string="${JDK_VERSION}" pattern="^(8)$" />
+				</not>
+				<or>
+					<contains string="${SPEC}" substring="aix_ppc-64"/>
+					<contains string="${SPEC}" substring="linux_ppc-64_le"/>
+					<contains string="${SPEC}" substring="linux_x86-64"/>
+					<contains string="${SPEC}" substring="win_x86-64"/>
+					<contains string="${SPEC}" substring="linux_390-64"/>
+				</or>
+			</and>
 			<then>
 				<antcall target="clean" inheritall="true" />
 			</then>
 		</if>
-		
 	</target>
+
 </project>
diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml
index 8309c47108..a1bf6c68b3 100644
--- a/functional/OpenJcePlusTests/playlist.xml
+++ b/functional/OpenJcePlusTests/playlist.xml
@@ -43,7 +43,8 @@
 		cp -r ${REPORTDIR}/target/surefire-reports/* junitreports
 		</command>
 		<features>
-			<feature>FIPS140_2:nonapplicable</feature>
+			<feature>FIPS140_3_OpenJCEPlusFIPS:required</feature>
+			<feature>FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:required</feature>
 		</features>
 		<levels>
 			<level>extended</level>