Skip to content

Commit

Permalink
Add new dependencies required for OpenJCEPlus tests (adoptium#5452)
Browse files Browse the repository at this point in the history
The OpenJCEPlus tests require a new test dependency for interop
testing with bouncy castle.

Signed-off-by: Jason Katonica <katonica@us.ibm.com>
  • Loading branch information
jasonkatonica authored Jul 17, 2024
1 parent c72ef0c commit 11e5175
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
6 changes: 5 additions & 1 deletion functional/OpenJcePlusTests/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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,junit_vintage_engine,junit_platform_suite,junit_jupiter_api,junit_jupiter_engine,junit_jupiter_params,junit_platform_suite_api"/>
<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"/>
<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
<property environment="env" />

Expand Down Expand Up @@ -121,6 +121,8 @@
<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" />
Expand All @@ -141,6 +143,8 @@
<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" />
Expand Down
16 changes: 12 additions & 4 deletions functional/OpenJcePlusTests/test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,16 @@
</java>
</target>
<target name="test">
<echo message="Command: ${TEST_JAVA} -cp junit4.jar:hamcrest-core.jar:bcprov-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" />
<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" />
Expand All @@ -63,14 +65,16 @@
<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: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" />
<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" />
Expand All @@ -83,14 +87,16 @@
<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: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" />
<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" />
Expand All @@ -103,14 +109,16 @@
<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: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" />
<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" />
Expand Down

0 comments on commit 11e5175

Please sign in to comment.