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

[Christoph Langer]

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.

> /contributor add Jonathan Dowland [jdowland at openjdk.org](mailto:jdowland at openjdk.org)
> /contributor remove Fernando Guallini [fguallini at openjdk.org](mailto:fguallini at openjdk.org)
> 
> Looking at my chain of three dependent PRs, I realised this one (at the bottom of the stack) had Fernando as author (due to the way I cherry picked the commit: Fernando is the original patch author upstream). The above commands are an attempt to make this PR consistent with others, where the backporter is listed as author. Alternatively I could rewrite the commit and force-push, but I would then invalidate the PR's Review and need to rebase the two dependent PRs. Sorry for the noise: I'm slowly getting there with the Skara/GH workflow!

@jmtd, that's not necessary. With the git workflow, you'll be the author of the backport when the change is integrated, no matter what you have in your commit. Also, with the new workflow a backport would not set the original author as author of the backport and that's also how it should be (unless you worked together with Fernando on the backport and owe him some credits). So I suggest you also remove yourself as additional contributor...

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

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