Author: niallp
Date: Fri Nov 28 20:46:54 2008
New Revision: 721626
URL: http://svn.apache.org/viewvc?rev=721626&view=rev
Log:
IO-142 Add facility to sort file lists/arrays to Comparator implementations
Added:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java
(with props)
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/DefaultFileComparator.java
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/NameFileComparator.java
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/PathFileComparator.java
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ReverseComparator.java
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/SizeFileComparator.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/SizeFileComparatorTest.java
Added:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java?rev=721626&view=auto
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java
(added)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io.comparator;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Abstract file [EMAIL PROTECTED] Comparator} which provides sorting for file
arrays and lists.
+ *
+ * @version $Revision$ $Date$
+ * @since Commons IO 2.0
+ */
+abstract class AbstractFileComparator implements Comparator<File> {
+
+ /**
+ * Sort an array of files.
+ * <p>
+ * This method uses [EMAIL PROTECTED] Arrays#sort(File[], Comparator)}
+ * and returns the original array.
+ *
+ * @param files The files to sort, may be null
+ * @return The sorted array
+ */
+ public File[] sort(File... files) {
+ if (files != null) {
+ Arrays.sort(files, this);
+ }
+ return files;
+ }
+
+ /**
+ * Sort a List of files.
+ * <p>
+ * This method uses [EMAIL PROTECTED] Collections#sort(List, Comparator)}
+ * and returns the original list.
+ *
+ * @param files The files to sort, may be null
+ * @return The sorted list
+ */
+ public List<File> sort(List<File> files) {
+ if (files != null) {
+ Collections.sort(files, this);
+ }
+ return files;
+ }
+}
Propchange:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/AbstractFileComparator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/DefaultFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/DefaultFileComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/DefaultFileComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/DefaultFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -30,21 +30,21 @@
* [EMAIL PROTECTED] #DEFAULT_COMPARATOR} singleton instance:
* <pre>
* List<File> list = ...
- * Collections.sort(list, DefaultFileComparator.DEFAULT_COMPARATOR);
+ * DefaultFileComparator.DEFAULT_COMPARATOR.sort(list);
* </pre>
* <p>
* Example of doing a <i>reverse</i> sort of an array of files using the
* [EMAIL PROTECTED] #DEFAULT_REVERSE} singleton instance:
* <pre>
* File[] array = ...
- * Arrays.sort(array, DefaultFileComparator.DEFAULT_REVERSE);
+ * DefaultFileComparator.DEFAULT_REVERSE.sort(array);
* </pre>
* <p>
*
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-public class DefaultFileComparator implements Comparator<File>, Serializable {
+public class DefaultFileComparator extends AbstractFileComparator implements
Serializable {
/** Singleton default comparator instance */
public static final Comparator<File> DEFAULT_COMPARATOR = new
DefaultFileComparator();
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ExtensionFileComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ExtensionFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -37,21 +37,21 @@
* [EMAIL PROTECTED] #EXTENSION_COMPARATOR} singleton instance:
* <pre>
* List<File> list = ...
- * Collections.sort(list, ExtensionFileComparator.EXTENSION_COMPARATOR);
+ * ExtensionFileComparator.EXTENSION_COMPARATOR.sort(list);
* </pre>
* <p>
* Example of a <i>reverse case-insensitive</i> file extension sort using the
* [EMAIL PROTECTED] #EXTENSION_INSENSITIVE_REVERSE} singleton instance:
* <pre>
* File[] array = ...
- * Arrays.sort(array,
ExtensionFileComparator.EXTENSION_INSENSITIVE_REVERSE);
+ * ExtensionFileComparator.EXTENSION_INSENSITIVE_REVERSE.sort(array);
* </pre>
* <p>
*
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-public class ExtensionFileComparator implements Comparator<File>, Serializable
{
+public class ExtensionFileComparator extends AbstractFileComparator implements
Serializable {
/** Case-sensitive extension comparator instance (see [EMAIL PROTECTED]
IOCase#SENSITIVE}) */
public static final Comparator<File> EXTENSION_COMPARATOR = new
ExtensionFileComparator();
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/LastModifiedFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -31,21 +31,21 @@
* [EMAIL PROTECTED] #LASTMODIFIED_COMPARATOR} singleton instance:
* <pre>
* List<File> list = ...
- * Collections.sort(list,
LastModifiedFileComparator.LASTMODIFIED_COMPARATOR);
+ * LastModifiedFileComparator.LASTMODIFIED_COMPARATOR.sort(list);
* </pre>
* <p>
* Example of doing a <i>reverse</i> sort of an array of files using the
* [EMAIL PROTECTED] #LASTMODIFIED_REVERSE} singleton instance:
* <pre>
* File[] array = ...
- * Arrays.sort(array, LastModifiedFileComparator.LASTMODIFIED_REVERSE);
+ * LastModifiedFileComparator.LASTMODIFIED_REVERSE.sort(array);
* </pre>
* <p>
*
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-public class LastModifiedFileComparator implements Comparator<File>,
Serializable {
+public class LastModifiedFileComparator extends AbstractFileComparator
implements Serializable {
/** Last modified comparator instance */
public static final Comparator<File> LASTMODIFIED_COMPARATOR = new
LastModifiedFileComparator();
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/NameFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/NameFileComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/NameFileComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/NameFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -35,21 +35,21 @@
* [EMAIL PROTECTED] #NAME_COMPARATOR} singleton instance:
* <pre>
* List<File> list = ...
- * Collections.sort(list, NameFileComparator.NAME_COMPARATOR);
+ * NameFileComparator.NAME_COMPARATOR.sort(list);
* </pre>
* <p>
* Example of a <i>reverse case-insensitive</i> file name sort using the
* [EMAIL PROTECTED] #NAME_INSENSITIVE_REVERSE} singleton instance:
* <pre>
* File[] array = ...
- * Arrays.sort(array, NameFileComparator.NAME_INSENSITIVE_REVERSE);
+ * NameFileComparator.NAME_INSENSITIVE_REVERSE.sort(array);
* </pre>
* <p>
*
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-public class NameFileComparator implements Comparator<File>, Serializable {
+public class NameFileComparator extends AbstractFileComparator implements
Serializable {
/** Case-sensitive name comparator instance (see [EMAIL PROTECTED]
IOCase#SENSITIVE}) */
public static final Comparator<File> NAME_COMPARATOR = new
NameFileComparator();
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/PathFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/PathFileComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/PathFileComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/PathFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -35,21 +35,21 @@
* [EMAIL PROTECTED] #PATH_COMPARATOR} singleton instance:
* <pre>
* List<File> list = ...
- * Collections.sort(list, PathFileComparator.PATH_COMPARATOR);
+ * PathFileComparator.PATH_COMPARATOR.sort(list);
* </pre>
* <p>
* Example of a <i>reverse case-insensitive</i> file path sort using the
* [EMAIL PROTECTED] #PATH_INSENSITIVE_REVERSE} singleton instance:
* <pre>
* File[] array = ...
- * Arrays.sort(array, PathFileComparator.PATH_INSENSITIVE_REVERSE);
+ * PathFileComparator.PATH_INSENSITIVE_REVERSE.sort(array);
* </pre>
* <p>
*
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-public class PathFileComparator implements Comparator<File>, Serializable {
+public class PathFileComparator extends AbstractFileComparator implements
Serializable {
/** Case-sensitive path comparator instance (see [EMAIL PROTECTED]
IOCase#SENSITIVE}) */
public static final Comparator<File> PATH_COMPARATOR = new
PathFileComparator();
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ReverseComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ReverseComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ReverseComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/ReverseComparator.java
Fri Nov 28 20:46:54 2008
@@ -27,7 +27,7 @@
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-class ReverseComparator implements Comparator<File>, Serializable {
+class ReverseComparator extends AbstractFileComparator implements Serializable
{
private final Comparator<File> delegate;
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/SizeFileComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/SizeFileComparator.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/SizeFileComparator.java
(original)
+++
commons/proper/io/trunk/src/java/org/apache/commons/io/comparator/SizeFileComparator.java
Fri Nov 28 20:46:54 2008
@@ -33,14 +33,14 @@
* [EMAIL PROTECTED] #SIZE_COMPARATOR} singleton instance:
* <pre>
* List<File> list = ...
- * Collections.sort(list, LengthFileComparator.LENGTH_COMPARATOR);
+ * SizeFileComparator.SIZE_COMPARATOR.sort(list);
* </pre>
* <p>
* Example of doing a <i>reverse</i> sort of an array of files using the
* [EMAIL PROTECTED] #SIZE_REVERSE} singleton instance:
* <pre>
* File[] array = ...
- * Arrays.sort(array, LengthFileComparator.LENGTH_REVERSE);
+ * SizeFileComparator.SIZE_REVERSE.sort(array);
* </pre>
* <p>
* <strong>N.B.</strong> Directories are treated as <b>zero size</b> unless
@@ -49,7 +49,7 @@
* @version $Revision$ $Date$
* @since Commons IO 1.4
*/
-public class SizeFileComparator implements Comparator<File>, Serializable {
+public class SizeFileComparator extends AbstractFileComparator implements
Serializable {
/** Size comparator instance - directories are treated as zero size */
public static final Comparator<File> SIZE_COMPARATOR = new
SizeFileComparator();
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ComparatorAbstractTestCase.java
Fri Nov 28 20:46:54 2008
@@ -17,7 +17,10 @@
package org.apache.commons.io.comparator;
import java.io.File;
+import java.util.ArrayList;
import java.util.Comparator;
+import java.util.List;
+
import org.apache.commons.io.testtools.FileBasedTestCase;
/**
@@ -26,7 +29,7 @@
public abstract class ComparatorAbstractTestCase extends FileBasedTestCase {
/** comparator instance */
- protected Comparator comparator;
+ protected AbstractFileComparator comparator;
/** reverse comparator instance */
protected Comparator reverse;
@@ -53,7 +56,7 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
- comparator = DefaultFileComparator.DEFAULT_COMPARATOR;
+ comparator =
(AbstractFileComparator)DefaultFileComparator.DEFAULT_COMPARATOR;
reverse = DefaultFileComparator.DEFAULT_REVERSE;
}
@@ -84,4 +87,32 @@
assertTrue("less", reverse.compare(moreFile, lessFile) < 0);
assertTrue("more", reverse.compare(lessFile, moreFile) > 0);
}
+
+ /**
+ * Test the comparator array sort.
+ */
+ public void testSortArray() {
+ File[] files = new File[3];
+ files[0] = equalFile1;
+ files[1] = moreFile;
+ files[2] = lessFile;
+ comparator.sort(files);
+ assertTrue("equal", files[0] == lessFile);
+ assertTrue("less", files[1] == equalFile1);
+ assertTrue("more", files[2] == moreFile);
+ }
+
+ /**
+ * Test the comparator array sort.
+ */
+ public void testSortList() {
+ List<File> files = new ArrayList<File>();
+ files.add(equalFile1);
+ files.add(moreFile);
+ files.add(lessFile);
+ comparator.sort(files);
+ assertTrue("equal", files.get(0) == lessFile);
+ assertTrue("less", files.get(1) == equalFile1);
+ assertTrue("more", files.get(2) == moreFile);
+ }
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/DefaultFileComparatorTest.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/DefaultFileComparatorTest.java
Fri Nov 28 20:46:54 2008
@@ -56,11 +56,11 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
super.setUp();
- comparator = DefaultFileComparator.DEFAULT_COMPARATOR;
+ comparator =
(AbstractFileComparator)DefaultFileComparator.DEFAULT_COMPARATOR;
reverse = DefaultFileComparator.DEFAULT_REVERSE;
- equalFile1 = new File("same");
- equalFile2 = new File("same");
+ equalFile1 = new File("foo");
+ equalFile2 = new File("foo");
lessFile = new File("ABC");
- moreFile = new File("DEF");
+ moreFile = new File("XYZ");
}
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/ExtensionFileComparatorTest.java
Fri Nov 28 20:46:54 2008
@@ -56,11 +56,11 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
super.setUp();
- comparator = ExtensionFileComparator.EXTENSION_COMPARATOR;
+ comparator =
(AbstractFileComparator)ExtensionFileComparator.EXTENSION_COMPARATOR;
reverse = ExtensionFileComparator.EXTENSION_REVERSE;
- equalFile1 = new File("foo.txt");
- equalFile2 = new File("bar.txt");
- lessFile = new File("DEF.doc");
- moreFile = new File("ABC.txt");
+ equalFile1 = new File("file.foo");
+ equalFile2 = new File("file.foo");
+ lessFile = new File("file.abc");
+ moreFile = new File("file.xyz");
}
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/LastModifiedFileComparatorTest.java
Fri Nov 28 20:46:54 2008
@@ -56,12 +56,23 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
super.setUp();
- comparator = LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
+ comparator =
(AbstractFileComparator)LastModifiedFileComparator.LASTMODIFIED_COMPARATOR;
reverse = LastModifiedFileComparator.LASTMODIFIED_REVERSE;
File dir = getTestDirectory();
File olderFile = new File(dir, "older.txt");
createFile(olderFile, 0);
+ File equalFile = new File(dir, "equal.txt");
+ createFile(equalFile, 0);
+ do {
+ try {
+ Thread.sleep(300);
+ } catch(InterruptedException ie) {
+ // ignore
+ }
+ equalFile.setLastModified(System.currentTimeMillis());
+ } while( olderFile.lastModified() == equalFile.lastModified() );
+
File newerFile = new File(dir, "newer.txt");
createFile(newerFile, 0);
do {
@@ -71,9 +82,9 @@
// ignore
}
newerFile.setLastModified(System.currentTimeMillis());
- } while( olderFile.lastModified() == newerFile.lastModified() );
- equalFile1 = olderFile;
- equalFile2 = olderFile;
+ } while( equalFile.lastModified() == newerFile.lastModified() );
+ equalFile1 = equalFile;
+ equalFile2 = equalFile;
lessFile = olderFile;
moreFile = newerFile;
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/NameFileComparatorTest.java
Fri Nov 28 20:46:54 2008
@@ -56,11 +56,11 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
super.setUp();
- comparator = NameFileComparator.NAME_COMPARATOR;
+ comparator =
(AbstractFileComparator)NameFileComparator.NAME_INSENSITIVE_COMPARATOR;
reverse = NameFileComparator.NAME_REVERSE;
equalFile1 = new File("a/foo.txt");
equalFile2 = new File("b/foo.txt");
lessFile = new File("c/ABC.txt");
- moreFile = new File("d/DEF.txt");
+ moreFile = new File("d/XYZ.txt");
}
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/PathFileComparatorTest.java
Fri Nov 28 20:46:54 2008
@@ -56,11 +56,11 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
super.setUp();
- comparator = PathFileComparator.PATH_COMPARATOR;
+ comparator =
(AbstractFileComparator)PathFileComparator.PATH_COMPARATOR;
reverse = PathFileComparator.PATH_REVERSE;
equalFile1 = new File("foo/file.txt");
equalFile2 = new File("foo/file.txt");
lessFile = new File("abc/file.txt");
- moreFile = new File("def/file.txt");
+ moreFile = new File("xyz/file.txt");
}
}
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/SizeFileComparatorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/SizeFileComparatorTest.java?rev=721626&r1=721625&r2=721626&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/SizeFileComparatorTest.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/comparator/SizeFileComparatorTest.java
Fri Nov 28 20:46:54 2008
@@ -61,19 +61,21 @@
/** @see junit.framework.TestCase#setUp() */
protected void setUp() throws Exception {
super.setUp();
- comparator = SizeFileComparator.SIZE_COMPARATOR;
+ comparator =
(AbstractFileComparator)SizeFileComparator.SIZE_COMPARATOR;
reverse = SizeFileComparator.SIZE_REVERSE;
File dir = getTestDirectory();
smallerDir = new File(dir, "smallerdir");
largerDir = new File(dir, "largerdir");
smallerFile = new File(smallerDir, "smaller.txt");
+ File equalFile = new File(dir, "equal.txt");
largerFile = new File(largerDir, "larger.txt");
smallerDir.mkdir();
largerDir.mkdir();
createFile(smallerFile, 32);
+ createFile(equalFile, 48);
createFile(largerFile, 64);
- equalFile1 = smallerFile;
- equalFile2 = smallerFile;
+ equalFile1 = equalFile;
+ equalFile2 = equalFile;
lessFile = smallerFile;
moreFile = largerFile;
}
