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

Jonathan Dowland jdowland at openjdk.java.net
Thu Sep 30 10:40:43 UTC 2021


On Wed, 22 Sep 2021 14:07:43 GMT, Jonathan Dowland <jdowland at openjdk.org> wrote:

> 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.

This pull request has now been integrated.

Changeset: 05cb444e
Author:    Jonathan Dowland <jdowland at openjdk.org>
Committer: Christoph Langer <clanger at openjdk.org>
URL:       https://git.openjdk.java.net/jdk11u-dev/commit/05cb444eadf79546d6f5b8b6ca84af071a9ef8db
Stats:     1155 lines in 18 files changed: 191 ins; 899 del; 65 mod

8180571: Refactor sun/security/pkcs11 shell tests to plain java tests and fix failures

Co-authored-by: Jonathan Dowland <jdowland at openjdk.org>
Reviewed-by: goetz
Backport-of: ccfcd926674ee0bd88f34b16b489abe008169b11

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

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


More information about the jdk-updates-dev mailing list