Skip to content

Commit 6def419

Browse files
committed
Restore DirectoryUtilsTest changes
1 parent 6aa5a34 commit 6def419

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

data-loader/cli/src/test/java/com/scalar/db/dataloader/cli/util/DirectoryUtilsTest.java

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
import java.nio.file.Files;
99
import java.nio.file.Path;
1010
import java.nio.file.Paths;
11-
import java.nio.file.attribute.PosixFilePermission;
12-
import java.util.HashSet;
13-
import java.util.Set;
1411
import java.util.stream.Stream;
1512
import org.junit.jupiter.api.AfterEach;
16-
import org.junit.jupiter.api.Assumptions;
1713
import org.junit.jupiter.api.Test;
1814
import org.junit.jupiter.api.io.TempDir;
1915
import org.slf4j.Logger;
@@ -48,25 +44,13 @@ void validateOrCreateTargetDirectory_DirectoryDoesNotExist_CreatesDirectory()
4844
@Test
4945
void validateOrCreateTargetDirectory_DirectoryNotWritable_ThrowsException() throws IOException {
5046
Path readOnlyDirectory = Files.createDirectory(Paths.get(tempDir.toString(), "readOnlyDir"));
47+
readOnlyDirectory.toFile().setWritable(false);
5148

52-
// Try to make it read-only using POSIX if supported
53-
try {
54-
Set<PosixFilePermission> perms = new HashSet<>();
55-
perms.add(PosixFilePermission.OWNER_READ);
56-
perms.add(PosixFilePermission.OWNER_EXECUTE);
57-
Files.setPosixFilePermissions(readOnlyDirectory, perms);
58-
} catch (UnsupportedOperationException | IOException e) {
59-
// Fall back for systems without POSIX support
60-
readOnlyDirectory.toFile().setWritable(false);
61-
}
62-
// Verify it is actually non-writable
63-
boolean isWritable = Files.isWritable(readOnlyDirectory);
64-
Assumptions.assumeFalse(isWritable, "Directory is still writable; skipping test.");
65-
66-
// Test
6749
assertThrows(
6850
DirectoryValidationException.class,
69-
() -> DirectoryUtils.validateOrCreateTargetDirectory(readOnlyDirectory.toString()));
51+
() -> {
52+
DirectoryUtils.validateOrCreateTargetDirectory(readOnlyDirectory.toString());
53+
});
7054
}
7155

7256
@Test

0 commit comments

Comments
 (0)