infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-07 00:48:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

8376700: java/nio/file/DirectoryStream/SecureDS.java fails AtomicMoveNotSupportedException

Browse Source 
Reviewed-by: bpb
This commit is contained in:
SendaoYan 2026-02-03 02:21:06 +00:00
parent 1cb4ef8581
commit caf1338243
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/jdk/java/nio/file/DirectoryStream/SecureDS.java
View File

@ -21,31 +21,43 @@
* questions.
*/
/* @test
/* @test id=tmp
* @bug 4313887 6838333 8343020 8357425
* @summary Unit test for java.nio.file.SecureDirectoryStream
* @requires (os.family == "linux" | os.family == "mac" | os.family == "aix")
* @library .. /test/lib
* @build jdk.test.lib.Platform
* @build jdk.test.lib.Platform jtreg.SkippedException
* @run main SecureDS
*/
/* @test id=cwd
* @requires (os.family == "linux" | os.family == "mac" | os.family == "aix")
* @library .. /test/lib
* @build jdk.test.lib.Platform jtreg.SkippedException
* @run main SecureDS cwd
*/
import java.nio.file.*;
import static java.nio.file.Files.*;
import static java.nio.file.StandardOpenOption.*;
import static java.nio.file.LinkOption.*;
import java.nio.file.attribute.*;
import java.nio.channels.*;
import java.io.IOException;
import java.util.*;
import jdk.test.lib.Platform;
import jtreg.SkippedException;
public class SecureDS {
static boolean supportsSymbolicLinks;
public static void main(String[] args) throws IOException {
Path dir = TestUtil.createTemporaryDirectory();
Path dir;
if (args.length > 0 && args[0].equals("cwd")) {
dir = TestUtil.createTemporaryDirectory(System.getProperty("user.dir"));
} else {
dir = TestUtil.createTemporaryDirectory();
}
try {
DirectoryStream<Path> stream = newDirectoryStream(dir);
stream.close();
@ -301,7 +313,17 @@ public class SecureDS {
Files.writeString(filepath, TEXT);
try (DirectoryStream<Path> ds = Files.newDirectoryStream(dir);) {
if (ds instanceof SecureDirectoryStream<Path> sds) {
sds.move(file, null, file);
try {
sds.move(file, null, file);
} catch (AtomicMoveNotSupportedException e) {
if (Files.getFileStore(cwd).equals(Files.getFileStore(dir))) {
// re-throw if move between same volume
throw e;
} else {
throw new SkippedException(
"java.nio.file.AtomicMoveNotSupportedException");
}
}
if (!TEXT.equals(Files.readString(result)))
throw new RuntimeException(result + " content incorrect");
} else {
@ -311,11 +333,10 @@ public class SecureDS {
boolean fileDeleted = Files.deleteIfExists(filepath);
if (!fileDeleted)
Files.deleteIfExists(result);
// clean-up
delete(dir1);
delete(dir2);
}
// clean-up
delete(dir1);
delete(dir2);
}
// null and ClosedDirectoryStreamException