[jdk11u-dev] Integrated: 8210908: Refactor java/util/prefs/PrefsSpi.sh to plain java test
Aleksey Shipilev
shade at openjdk.java.net
Fri Aug 13 07:24:27 UTC 2021
On Wed, 11 Aug 2021 08:05:02 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:
> Backporting for `11.0.13-oracle` parity.
>
> This is an unclean backport, because `JarUtils.createJarFile` does not have the overload that accepts only `(Path, Path)`. I fixed it as follows:
>
>
> diff --git a/test/jdk/java/util/prefs/PrefsSpiTest.java b/test/jdk/java/util/prefs/PrefsSpiTest.java
> index 0369c60cae2..7e5b59ff754 100644
> --- a/test/jdk/java/util/prefs/PrefsSpiTest.java
> +++ b/test/jdk/java/util/prefs/PrefsSpiTest.java
> @@ -34,6 +34,7 @@
> import java.io.File;
> import java.nio.file.Files;
> import java.nio.file.Path;
> +import java.nio.file.Paths;
> import java.util.ArrayList;
> import java.util.List;
>
> @@ -74,7 +75,7 @@ public class PrefsSpiTest {
> Files.copy(source, target, REPLACE_EXISTING);
> }
>
> - JarUtils.createJarFile(SPIJAR, xdir);
> + JarUtils.createJarFile(SPIJAR, xdir, Paths.get("."));
> }
>
> @DataProvider
>
>
> Additional testing:
> - [x] New test passes
> - [x] `java/util/prefs` tests pass
> - [x] Eyeballing new test output
This pull request has now been integrated.
Changeset: 97930e74
Author: Aleksey Shipilev <shade at openjdk.org>
URL: https://git.openjdk.java.net/jdk11u-dev/commit/97930e74ecf1007742ac1fc0c9fc5ea5d89695a0
Stats: 282 lines in 5 files changed: 176 ins; 104 del; 2 mod
8210908: Refactor java/util/prefs/PrefsSpi.sh to plain java test
Reviewed-by: phh
Backport-of: 6ce0aeb00b10738b25f0f53ff785bfc099ef28c4
-------------
PR: https://git.openjdk.java.net/jdk11u-dev/pull/231
More information about the jdk-updates-dev
mailing list