[jdk11u-dev] RFR: 8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures

Jonathan Dowland jdowland at openjdk.java.net
Wed Sep 22 14:16:18 UTC 2021


Please consider this backport of [JDK-8180571](https://bugs.openjdk.java.net/browse/JDK-8180571) to 11u.

It's not a clean backport. cherry-pick conflicts manually resolved:

 * all file deletions didn't succeed due to hunk differences
 * all: copyright year differences 
 * `ReadConfInUTF16Env.java`: upstream hunks differ due to removed SPARC support
 * `PKCS11Test.java`: import list differences (nio imports not present in 11u's copy, resolved by including them as this change needs them)

The test `Login.java` needed further alterations for 11u:

 * two uses of JDK12+ `instanceof` pattern matching needed unsugaring
 * Removed @run argument `-Djava.security.manager=allow`. This is invalid for JDK11 (and corresponds to the JDK11 behaviour when specified for 12+)

All included tests now pass for me. Awaiting GitHub's tier1 test results.

-------------

Commit messages:
 - Backport ccfcd926674ee0bd88f34b16b489abe008169b11

Changes: https://git.openjdk.java.net/jdk11u-dev/pull/396/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=396&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8180571
  Stats: 1155 lines in 18 files changed: 191 ins; 899 del; 65 mod
  Patch: https://git.openjdk.java.net/jdk11u-dev/pull/396.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/396/head:pull/396

PR: https://git.openjdk.java.net/jdk11u-dev/pull/396


More information about the jdk-updates-dev mailing list