This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new e3cac47 Move test method to better location.
e3cac47 is described below
commit e3cac4756acac4a961955f0312ad545ccd569e63
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Sep 27 14:21:23 2021 -0400
Move test method to better location.
---
.../commons/io/file/PathUtilsDeleteFileTest.java | 54 ---------------
.../org/apache/commons/io/file/PathUtilsTest.java | 76 +++++++++++++++++++---
2 files changed, 68 insertions(+), 62 deletions(-)
diff --git
a/src/test/java/org/apache/commons/io/file/PathUtilsDeleteFileTest.java
b/src/test/java/org/apache/commons/io/file/PathUtilsDeleteFileTest.java
index 173c9e0..0101291 100644
--- a/src/test/java/org/apache/commons/io/file/PathUtilsDeleteFileTest.java
+++ b/src/test/java/org/apache/commons/io/file/PathUtilsDeleteFileTest.java
@@ -147,60 +147,6 @@ public class PathUtilsDeleteFileTest {
Files.deleteIfExists(tempDir);
}
- @Test
- public void testSetReadOnlyFile() throws IOException {
- final Path resolved = tempDir.resolve("testSetReadOnlyFile.txt");
-
- // TEMP HACK
- assumeTrue(Files.getFileAttributeView(resolved,
DosFileAttributeView.class) != null);
- assumeTrue(Files.getFileAttributeView(resolved,
PosixFileAttributeView.class) == null);
-
- PathUtils.writeString(resolved, "test", StandardCharsets.UTF_8);
- final boolean readable = Files.isReadable(resolved);
- final boolean writable = Files.isWritable(resolved);
- final boolean regularFile = Files.isRegularFile(resolved);
- final boolean executable = Files.isExecutable(resolved);
- final boolean hidden = Files.isHidden(resolved);
- final boolean directory = Files.isDirectory(resolved);
- final boolean symbolicLink = Files.isSymbolicLink(resolved);
- // Sanity checks
- assertTrue(readable);
- assertTrue(writable);
- // Test A
- PathUtils.setReadOnly(resolved, false);
- assertEquals(true, Files.isReadable(resolved));
- assertEquals(true, Files.isWritable(resolved));
- assertEquals(regularFile, Files.isReadable(resolved));
- assertEquals(executable, Files.isExecutable(resolved));
- assertEquals(hidden, Files.isHidden(resolved));
- assertEquals(directory, Files.isDirectory(resolved));
- assertEquals(symbolicLink, Files.isSymbolicLink(resolved));
- // Test B
- PathUtils.setReadOnly(resolved, true);
- assertEquals(true, Files.isReadable(resolved));
- assertEquals(false, Files.isWritable(resolved));
- final DosFileAttributeView dosFileAttributeView =
Files.getFileAttributeView(resolved, DosFileAttributeView.class);
- if (dosFileAttributeView != null) {
- assertTrue(dosFileAttributeView.readAttributes().isReadOnly());
- }
- final PosixFileAttributeView posixFileAttributeView =
Files.getFileAttributeView(resolved, PosixFileAttributeView.class);
- if (posixFileAttributeView != null) {
- // Not Windows
- final Set<PosixFilePermission> permissions =
posixFileAttributeView.readAttributes().permissions();
- assertFalse(permissions.contains(PosixFilePermission.GROUP_WRITE),
() -> permissions.toString());
-
assertFalse(permissions.contains(PosixFilePermission.OTHERS_WRITE), () ->
permissions.toString());
- assertFalse(permissions.contains(PosixFilePermission.OWNER_WRITE),
() -> permissions.toString());
- }
- assertEquals(regularFile, Files.isReadable(resolved));
- assertEquals(executable, Files.isExecutable(resolved));
- assertEquals(hidden, Files.isHidden(resolved));
- assertEquals(directory, Files.isDirectory(resolved));
- assertEquals(symbolicLink, Files.isSymbolicLink(resolved));
- //
- PathUtils.setReadOnly(resolved, false);
- PathUtils.deleteFile(resolved);
- }
-
/**
* Tests a directory with one file of size 1.
*/
diff --git a/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
b/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
index 410f030..ea54292 100644
--- a/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/file/PathUtilsTest.java
@@ -21,6 +21,7 @@ import static
org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.IOException;
@@ -33,9 +34,13 @@ import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.file.attribute.DosFileAttributeView;
+import java.nio.file.attribute.PosixFileAttributeView;
+import java.nio.file.attribute.PosixFilePermission;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import org.apache.commons.io.filefilter.NameFileFilter;
import org.apache.commons.io.test.TestUtils;
@@ -247,15 +252,58 @@ public class PathUtilsTest extends TestArguments {
assertEquals(expected, PathUtils.readString(path, null));
}
- /**
- * Tests newOutputStream() here and don't use Files.write obviously.
- */
- private Path writeToNewOutputStream(final boolean append) throws
IOException {
- final Path file = tempDir.resolve("test1.txt");
- try (OutputStream os = PathUtils.newOutputStream(file, append)) {
- os.write(BYTE_ARRAY_FIXTURE);
+ @Test
+ public void testSetReadOnlyFile() throws IOException {
+ final Path resolved = tempDir.resolve("testSetReadOnlyFile.txt");
+
+ // TEMP HACK
+ assumeTrue(Files.getFileAttributeView(resolved,
DosFileAttributeView.class) != null);
+ assumeTrue(Files.getFileAttributeView(resolved,
PosixFileAttributeView.class) == null);
+
+ PathUtils.writeString(resolved, "test", StandardCharsets.UTF_8);
+ final boolean readable = Files.isReadable(resolved);
+ final boolean writable = Files.isWritable(resolved);
+ final boolean regularFile = Files.isRegularFile(resolved);
+ final boolean executable = Files.isExecutable(resolved);
+ final boolean hidden = Files.isHidden(resolved);
+ final boolean directory = Files.isDirectory(resolved);
+ final boolean symbolicLink = Files.isSymbolicLink(resolved);
+ // Sanity checks
+ assertTrue(readable);
+ assertTrue(writable);
+ // Test A
+ PathUtils.setReadOnly(resolved, false);
+ assertEquals(true, Files.isReadable(resolved));
+ assertEquals(true, Files.isWritable(resolved));
+ assertEquals(regularFile, Files.isReadable(resolved));
+ assertEquals(executable, Files.isExecutable(resolved));
+ assertEquals(hidden, Files.isHidden(resolved));
+ assertEquals(directory, Files.isDirectory(resolved));
+ assertEquals(symbolicLink, Files.isSymbolicLink(resolved));
+ // Test B
+ PathUtils.setReadOnly(resolved, true);
+ assertEquals(true, Files.isReadable(resolved));
+ assertEquals(false, Files.isWritable(resolved));
+ final DosFileAttributeView dosFileAttributeView =
Files.getFileAttributeView(resolved, DosFileAttributeView.class);
+ if (dosFileAttributeView != null) {
+ assertTrue(dosFileAttributeView.readAttributes().isReadOnly());
}
- return file;
+ final PosixFileAttributeView posixFileAttributeView =
Files.getFileAttributeView(resolved, PosixFileAttributeView.class);
+ if (posixFileAttributeView != null) {
+ // Not Windows
+ final Set<PosixFilePermission> permissions =
posixFileAttributeView.readAttributes().permissions();
+ assertFalse(permissions.contains(PosixFilePermission.GROUP_WRITE),
() -> permissions.toString());
+
assertFalse(permissions.contains(PosixFilePermission.OTHERS_WRITE), () ->
permissions.toString());
+ assertFalse(permissions.contains(PosixFilePermission.OWNER_WRITE),
() -> permissions.toString());
+ }
+ assertEquals(regularFile, Files.isReadable(resolved));
+ assertEquals(executable, Files.isExecutable(resolved));
+ assertEquals(hidden, Files.isHidden(resolved));
+ assertEquals(directory, Files.isDirectory(resolved));
+ assertEquals(symbolicLink, Files.isSymbolicLink(resolved));
+ //
+ PathUtils.setReadOnly(resolved, false);
+ PathUtils.deleteFile(resolved);
}
@Test
@@ -266,4 +314,16 @@ public class PathUtilsTest extends TestArguments {
TestUtils.assertEqualContent(text, file);
}
+ /**
+ * Tests newOutputStream() here and don't use Files.write obviously.
+ */
+ private Path writeToNewOutputStream(final boolean append) throws
IOException {
+ final Path file = tempDir.resolve("test1.txt");
+ try (OutputStream os = PathUtils.newOutputStream(file, append)) {
+ os.write(BYTE_ARRAY_FIXTURE);
+ }
+ return file;
+ }
+
+
}
