Skip to content

Commit 7664bff

Browse files
committed
Add tests to ensure directory size is non-zero
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1326677 13f79535-47bb-0310-9956-ffa450edef68
1 parent 9c776ac commit 7664bff

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

src/test/java/org/apache/commons/io/FileUtilsTestCase.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,9 @@ public void testCopyDirectoryToDirectory_NonExistingDest() throws Exception {
10081008

10091009
assertTrue("Check exists", destDir.exists());
10101010
assertTrue("Check exists", actualDestDir.exists());
1011-
assertEquals("Check size", FileUtils.sizeOfDirectory(srcDir), FileUtils.sizeOfDirectory(actualDestDir));
1011+
long srcSize = FileUtils.sizeOfDirectory(srcDir);
1012+
assertTrue("Size > 0", srcSize > 0);
1013+
assertEquals("Check size", srcSize, FileUtils.sizeOfDirectory(actualDestDir));
10121014
assertTrue(new File(actualDestDir, "sub/A.txt").exists());
10131015
FileUtils.deleteDirectory(destDir);
10141016
}
@@ -1027,7 +1029,9 @@ public void testCopyDirectoryToNonExistingDest() throws Exception {
10271029
FileUtils.copyDirectory(srcDir, destDir);
10281030

10291031
assertTrue("Check exists", destDir.exists());
1030-
assertEquals("Check size", FileUtils.sizeOfDirectory(srcDir), FileUtils.sizeOfDirectory(destDir));
1032+
long sizeOfSrcDirectory = FileUtils.sizeOfDirectory(srcDir);
1033+
assertTrue("Size > 0",sizeOfSrcDirectory > 0);
1034+
assertEquals("Check size", sizeOfSrcDirectory, FileUtils.sizeOfDirectory(destDir));
10311035
assertTrue(new File(destDir, "sub/A.txt").exists());
10321036
FileUtils.deleteDirectory(destDir);
10331037
}
@@ -1046,7 +1050,9 @@ public void testCopyDirectoryToExistingDest() throws Exception {
10461050

10471051
FileUtils.copyDirectory(srcDir, destDir);
10481052

1049-
assertEquals(FileUtils.sizeOfDirectory(srcDir), FileUtils.sizeOfDirectory(destDir));
1053+
long srcSize = FileUtils.sizeOfDirectory(srcDir);
1054+
assertTrue("Size > 0",srcSize > 0);
1055+
assertEquals(srcSize, FileUtils.sizeOfDirectory(destDir));
10501056
assertTrue(new File(destDir, "sub/A.txt").exists());
10511057
}
10521058

@@ -1132,6 +1138,8 @@ public void testCopyDirectoryToChild() throws Exception {
11321138
FileUtils.copyDirectory(parentDir, childDir);
11331139
assertEquals(expectedCount, LIST_WALKER.list(grandParentDir).size());
11341140
assertEquals(expectedSize, FileUtils.sizeOfDirectory(grandParentDir));
1141+
assertTrue("Count > 0", expectedCount > 0);
1142+
assertTrue("Size > 0", expectedSize > 0);
11351143
}
11361144

11371145
/** Test for IO-141 */
@@ -1146,6 +1154,7 @@ public void testCopyDirectoryToGrandChild() throws Exception {
11461154
FileUtils.copyDirectory(grandParentDir, childDir);
11471155
assertEquals(expectedCount, LIST_WALKER.list(grandParentDir).size());
11481156
assertEquals(expectedSize, FileUtils.sizeOfDirectory(grandParentDir));
1157+
assertTrue("Size > 0",expectedSize > 0);
11491158
}
11501159

11511160
/** Test for IO-217 FileUtils.copyDirectoryToDirectory makes infinite loops */

0 commit comments

Comments
 (0)