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 5026e54 Assert that the test set up worked.
5026e54 is described below
commit 5026e5428cf507aa1f3e9e8e6d776aa23da8b40f
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Aug 14 21:50:35 2020 -0400
Assert that the test set up worked.
---
.../io/FileUtilsCleanDirectoryTestCase.java | 3 +--
.../commons/io/FileUtilsCleanSymlinksTestCase.java | 24 +++++++++++-----------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git
a/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java
index 6abee2d..940901a 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java
@@ -129,8 +129,7 @@ public class FileUtilsCleanDirectoryTestCase {
} catch (final IOException e) {
return false;
}
- final int result = proc.waitFor();
- return result == 0;
+ return proc.waitFor() == 0;
}
}
diff --git
a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java
index 1e5fb13..e874bc3 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java
@@ -57,7 +57,7 @@ public class FileUtilsCleanSymlinksTestCase {
FileUtils.touch(randomFile);
final File symlinkFile = new File(realInner, "fakeinner");
- setupSymlink(randomFile, symlinkFile);
+ assertTrue(setupSymlink(randomFile, symlinkFile));
assertEquals(2, realInner.list().length);
@@ -94,7 +94,7 @@ public class FileUtilsCleanSymlinksTestCase {
assertEquals(1, randomDirectory.list().length);
final File symlinkDirectory = new File(realOuter, "fakeinner");
- setupSymlink(randomDirectory, symlinkDirectory);
+ assertTrue(setupSymlink(randomDirectory, symlinkDirectory));
assertEquals(1, symlinkDirectory.list().length);
@@ -129,12 +129,12 @@ public class FileUtilsCleanSymlinksTestCase {
assertEquals(1, randomDirectory.list().length);
final File symlinkDirectory = new File(realParent, "fakeinner");
- setupSymlink(randomDirectory, symlinkDirectory);
+ assertTrue(setupSymlink(randomDirectory, symlinkDirectory));
assertEquals(1, symlinkDirectory.list().length);
final File symlinkParentDirectory = new File(top, "fakeouter");
- setupSymlink(realParent, symlinkParentDirectory);
+ assertTrue(setupSymlink(realParent, symlinkParentDirectory));
// assert contents of the real directory were removed including the
symlink
FileUtils.cleanDirectory(symlinkParentDirectory);// should clean the
contents of this but not recurse into other links
@@ -159,7 +159,7 @@ public class FileUtilsCleanSymlinksTestCase {
assertEquals(1, randomDirectory.list().length);
final File symlinkDirectory = new File(top, "fakeDir");
- setupSymlink(randomDirectory, symlinkDirectory);
+ assertTrue(setupSymlink(randomDirectory, symlinkDirectory));
FileUtils.cleanDirectory(symlinkDirectory);
assertEquals(0, symlinkDirectory.list().length);
@@ -178,7 +178,7 @@ public class FileUtilsCleanSymlinksTestCase {
assertTrue(randomDirectory.mkdirs());
final File symlinkDirectory = new File(top, "fakeDir");
- setupSymlink(randomDirectory, symlinkDirectory);
+ assertTrue(setupSymlink(randomDirectory, symlinkDirectory));
assertTrue(FileUtils.isSymlink(symlinkDirectory));
assertFalse(FileUtils.isSymlink(randomDirectory));
@@ -195,7 +195,7 @@ public class FileUtilsCleanSymlinksTestCase {
FileUtils.touch(randomFile);
final File symlinkFile = new File(top, "fakeinner");
- setupSymlink(randomFile, symlinkFile);
+ assertTrue(setupSymlink(randomFile, symlinkFile));
assertTrue(FileUtils.isSymlink(symlinkFile));
assertFalse(FileUtils.isSymlink(randomFile));
@@ -213,7 +213,7 @@ public class FileUtilsCleanSymlinksTestCase {
final File badSymlinkInPathFile = new File(symlinkFile, "fakeinner");
final File noexistParentFile = new File("noexist", "file");
- setupSymlink(noexistFile, symlinkFile);
+ assertTrue(setupSymlink(noexistFile, symlinkFile));
assertTrue(FileUtils.isSymlink(symlinkFile));
assertFalse(FileUtils.isSymlink(noexistFile));
@@ -232,19 +232,19 @@ public class FileUtilsCleanSymlinksTestCase {
assertTrue(realParent.mkdirs());
final File symlinkParentDirectory = new File(top, "fakeparent");
- setupSymlink(realParent, symlinkParentDirectory);
+ assertTrue(setupSymlink(realParent, symlinkParentDirectory));
final File realChild = new File(symlinkParentDirectory, "realChild");
assertTrue(realChild.mkdirs());
final File symlinkChild = new File(symlinkParentDirectory,
"fakeChild");
- setupSymlink(realChild, symlinkChild);
+ assertTrue(setupSymlink(realChild, symlinkChild));
assertTrue(FileUtils.isSymlink(symlinkChild));
assertFalse(FileUtils.isSymlink(realChild));
}
- private void setupSymlink(final File res, final File link) throws
Exception {
+ private boolean setupSymlink(final File res, final File link) throws
Exception {
// create symlink
final List<String> args = new ArrayList<>();
args.add("ln");
@@ -256,7 +256,7 @@ public class FileUtilsCleanSymlinksTestCase {
Process proc;
proc = Runtime.getRuntime().exec(args.toArray(new
String[args.size()]));
- proc.waitFor();
+ return proc.waitFor() == 0;
}
}
