svn commit: r596583 - in /commons/proper/io/trunk/src/test/org/apache/commons/io: DirectoryWalkerTestCase.java FileUtilsTestCase.java

[niallp]

Author: niallp
Date: Tue Nov 20 01:42:01 2007
New Revision: 596583

URL: http://svn.apache.org/viewvc?rev=596583&view=rev
Log:
Replace the use of deprecated classes (in un-related tests) with non-deprecated 
versions

Modified:
    
commons/proper/io/trunk/src/test/org/apache/commons/io/DirectoryWalkerTestCase.java
    
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java

Modified: 
commons/proper/io/trunk/src/test/org/apache/commons/io/DirectoryWalkerTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/DirectoryWalkerTestCase.java?rev=596583&r1=596582&r2=596583&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/test/org/apache/commons/io/DirectoryWalkerTestCase.java
 (original)
+++ 
commons/proper/io/trunk/src/test/org/apache/commons/io/DirectoryWalkerTestCase.java
 Tue Nov 20 01:42:01 2007
@@ -54,11 +54,11 @@
     private static final File[] dirs       = new File[] {orgDir, apacheDir, 
commonsDir, ioDir, outputDir};
 
     // Files
-    private static final File copyUtils     = new File(ioDir, 
"CopyUtils.java");
+    private static final File filenameUtils = new File(ioDir, 
"FilenameUtils.java");
     private static final File ioUtils       = new File(ioDir, "IOUtils.java");
     private static final File proxyWriter   = new File(outputDir, 
"ProxyWriter.java");
     private static final File nullStream    = new File(outputDir, 
"NullOutputStream.java");
-    private static final File[] ioFiles     = new File[] {copyUtils, ioUtils};
+    private static final File[] ioFiles     = new File[] {filenameUtils, 
ioUtils};
     private static final File[] outputFiles = new File[] {proxyWriter, 
nullStream};
     
     // Filters

Modified: 
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java?rev=596583&r1=596582&r2=596583&view=diff
==============================================================================
--- 
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java 
(original)
+++ 
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java 
Tue Nov 20 01:42:01 2007
@@ -37,7 +37,7 @@
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
-import org.apache.commons.io.filefilter.WildcardFilter;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.io.testtools.FileBasedTestCase;
 
 /**
@@ -908,8 +908,8 @@
         }
 
         Collection files = FileUtils.listFiles(subDir,
-                                               new WildcardFilter("*.*"),
-                                               new WildcardFilter("*"));
+                                               new WildcardFileFilter("*.*"),
+                                               new WildcardFileFilter("*"));
 
         int count = files.size();
         Object[] fileObjs = files.toArray();
@@ -947,8 +947,8 @@
         }
 
         Iterator files = FileUtils.iterateFiles(subDir,
-                                                new WildcardFilter("*.*"),
-                                                new WildcardFilter("*"));
+                                                new WildcardFileFilter("*.*"),
+                                                new WildcardFileFilter("*"));
 
         Map foundFileNames = new HashMap();