Skip to content

Commit a6ddf9c

Browse files
committed
For some reason, the directory ".svn" is NOT hidden on my machine. Makes hidden filter tests take this into account.
(Microsoft Windows XP [Version 5.1.2600] SP2 + current patches) git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@484839 13f79535-47bb-0310-9956-ffa450edef68
1 parent 9d45063 commit a6ddf9c

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

src/test/org/apache/commons/io/filefilter/FileFilterTestCase.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
*/
3737
public class FileFilterTestCase extends FileBasedTestCase {
3838

39+
/**
40+
* The subversion directory name.
41+
*/
42+
static final String SVN_DIR_NAME = ".svn";
43+
3944
private static final boolean WINDOWS = (File.separatorChar == '\\');
4045

4146
public FileFilterTestCase(String name) {
@@ -558,7 +563,7 @@ public void testMakeSVNAware() throws Exception {
558563
IOFileFilter filter2 = FileFilterUtils.makeSVNAware(FileFilterUtils
559564
.nameFileFilter("test-file1.txt"));
560565

561-
File file = new File(getTestDirectory(), ".svn");
566+
File file = new File(getTestDirectory(), SVN_DIR_NAME);
562567
file.mkdirs();
563568
assertFiltering(filter1, file, false);
564569
assertFiltering(filter2, file, false);
@@ -574,7 +579,7 @@ public void testMakeSVNAware() throws Exception {
574579
assertFiltering(filter1, file, true);
575580
assertFiltering(filter2, file, false);
576581

577-
file = new File(getTestDirectory(), ".svn");
582+
file = new File(getTestDirectory(), SVN_DIR_NAME);
578583
createFile(file, 0);
579584
assertFiltering(filter1, file, true);
580585
assertFiltering(filter2, file, false);
@@ -680,10 +685,10 @@ public void testSizeFilter() throws Exception {
680685
}
681686

682687
public void testHidden() throws Exception {
683-
File hiddenDir = new File(".svn");
688+
File hiddenDir = new File(SVN_DIR_NAME);
684689
if (hiddenDir.exists()) {
685-
assertFiltering(HiddenFileFilter.HIDDEN, hiddenDir, true);
686-
assertFiltering(HiddenFileFilter.VISIBLE, hiddenDir, false);
690+
assertFiltering(HiddenFileFilter.HIDDEN, hiddenDir, hiddenDir.isHidden());
691+
assertFiltering(HiddenFileFilter.VISIBLE, hiddenDir, !hiddenDir.isHidden());
687692
}
688693
assertFiltering(HiddenFileFilter.HIDDEN, getTestDirectory(), false);
689694
assertFiltering(HiddenFileFilter.VISIBLE, getTestDirectory(), true);

0 commit comments

Comments
 (0)