[jdk11u-dev] RFR: 8210908: Refactor java/util/prefs/PrefsSpi.sh to plain java test
Aleksey Shipilev
shade at openjdk.java.net
Wed Aug 11 08:11:45 UTC 2021
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
-------------
Commit messages:
- Backport 6ce0aeb00b10738b25f0f53ff785bfc099ef28c4
Changes: https://git.openjdk.java.net/jdk11u-dev/pull/231/files
Webrev: https://webrevs.openjdk.java.net/?repo=jdk11u-dev&pr=231&range=00
Issue: https://bugs.openjdk.java.net/browse/JDK-8210908
Stats: 282 lines in 5 files changed: 176 ins; 104 del; 2 mod
Patch: https://git.openjdk.java.net/jdk11u-dev/pull/231.diff
Fetch: git fetch https://git.openjdk.java.net/jdk11u-dev pull/231/head:pull/231
PR: https://git.openjdk.java.net/jdk11u-dev/pull/231
More information about the jdk-updates-dev
mailing list