You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/04/25 01:20:30 UTC
svn commit: r1471765 [1/3] - in
/commons/proper/io/trunk/src/test/java/org/apache/commons/io: ./
filefilter/ input/ monitor/ output/ testtools/
Author: sebb
Date: Wed Apr 24 23:20:29 2013
New Revision: 1471765
URL: http://svn.apache.org/r1471765
Log:
Trailing spaces
These are the worst offenders; a few still remain with single spaces here and there
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/CopyUtilsTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/EndianUtilsTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOCaseTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/NullInputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/NullReaderTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/ReaderInputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/XmlStreamReaderUtilitiesTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/output/DeferredFileOutputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/testtools/FileBasedTestCase.java
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/CopyUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/CopyUtilsTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/CopyUtilsTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/CopyUtilsTest.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -33,7 +33,7 @@ import org.apache.commons.io.testtools.Y
/**
* JUnit tests for CopyUtils.
- *
+ *
* @version $Id$
* @see CopyUtils
*/
@@ -75,11 +75,11 @@ public class CopyUtilsTest extends FileB
new CopyUtils();
// Nothing to assert, the constructor is public and does not blow up.
}
-
+
public void testCopy_byteArrayToOutputStream() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
CopyUtils.copy(inData, out);
assertEquals("Sizes differ", inData.length, baout.size());
@@ -90,7 +90,7 @@ public class CopyUtilsTest extends FileB
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII");
-
+
CopyUtils.copy(inData, writer);
writer.flush();
@@ -101,7 +101,7 @@ public class CopyUtilsTest extends FileB
public void testCopy_byteArrayToWriterWithEncoding() throws Exception {
final String inDataStr = "data";
final String charsetName = "UTF-8";
- final StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
CopyUtils.copy(inDataStr.getBytes(charsetName), writer, charsetName);
assertEquals(inDataStr, writer.toString());
}
@@ -115,7 +115,7 @@ public class CopyUtilsTest extends FileB
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
final int count = CopyUtils.copy(in, out);
-
+
assertEquals("Not all bytes were read", 0, in.available());
assertEquals("Sizes differ", inData.length, baout.size());
assertTrue("Content differs", Arrays.equals(inData, baout.toByteArray()));
@@ -130,7 +130,7 @@ public class CopyUtilsTest extends FileB
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
final Writer writer = new java.io.OutputStreamWriter(out, "US-ASCII");
-
+
CopyUtils.copy(in, writer);
writer.flush();
@@ -152,10 +152,10 @@ public class CopyUtilsTest extends FileB
InputStream in = new ByteArrayInputStream(inData);
in = new YellOnCloseInputStream(in);
final Reader reader = new java.io.InputStreamReader(in, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
CopyUtils.copy(reader, out);
//Note: this method *does* flush. It is equivalent to:
// OutputStreamWriter _out = new OutputStreamWriter(fout);
@@ -190,7 +190,7 @@ public class CopyUtilsTest extends FileB
public void testCopy_stringToOutputStream() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -62,7 +62,7 @@ public class DirectoryWalkerTestCase {
private static final File nullStream = new File(outputDir, "NullOutputStream.java");
private static final File[] ioFiles = new File[] {filenameUtils, ioUtils};
private static final File[] outputFiles = new File[] {proxyWriter, nullStream};
-
+
// Filters
private static final IOFileFilter dirsFilter = createNameFilter(dirs);
private static final IOFileFilter iofilesFilter = createNameFilter(ioFiles);
@@ -203,7 +203,7 @@ public class DirectoryWalkerTestCase {
final List<File> results = new TestFileFinder(null, -1).find(invalidDir);
assertEquals("Result Size", 1, results.size());
assertTrue("Current Dir", results.contains(invalidDir));
-
+
try {
new TestFileFinder(null, -1).find(null);
fail("Null start directory didn't throw Exception");
@@ -338,7 +338,7 @@ public class DirectoryWalkerTestCase {
} catch(final IOException ex) {
fail("IOException: " + cancelName + " " + ex);
}
-
+
// Cancel on a directory
try {
cancelName = "commons";
@@ -351,7 +351,7 @@ public class DirectoryWalkerTestCase {
} catch(final IOException ex) {
fail("IOException: " + cancelName + " " + ex);
}
-
+
// Suppress CancelException (use same file name as preceding test)
try {
walker = new TestMultiThreadCancelWalker(cancelName, true);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -59,7 +59,7 @@ public class DirectoryWalkerTestCaseJava
private static final File nullStream = new File(outputDir, "NullOutputStream.java");
private static final File[] ioFiles = new File[] {filenameUtils, ioUtils};
private static final File[] outputFiles = new File[] {proxyWriter, nullStream};
-
+
// Filters
private static final IOFileFilter dirsFilter = createNameFilter(dirs);
private static final IOFileFilter iofilesFilter = createNameFilter(ioFiles);
@@ -206,7 +206,7 @@ public class DirectoryWalkerTestCaseJava
final List results = new TestFileFinder(null, -1).find(invalidDir);
assertEquals("Result Size", 1, results.size());
assertTrue("Current Dir", results.contains(invalidDir));
-
+
try {
new TestFileFinder(null, -1).find(null);
fail("Null start directory didn't throw Exception");
@@ -334,7 +334,7 @@ public class DirectoryWalkerTestCaseJava
} catch(final IOException ex) {
fail("IOException: " + cancelName + " " + ex);
}
-
+
// Cancel on a directory
try {
cancelName = "commons";
@@ -347,7 +347,7 @@ public class DirectoryWalkerTestCaseJava
} catch(final IOException ex) {
fail("IOException: " + cancelName + " " + ex);
}
-
+
// Suppress CancelException (use same file name as preceding test)
try {
walker = new TestMultiThreadCancelWalker(cancelName, true);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/EndianUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/EndianUtilsTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/EndianUtilsTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/EndianUtilsTest.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -86,8 +86,8 @@ public class EndianUtilsTest extends Tes
}
/**
- * Tests all swapXxxx methods for symmetry when going from one endian
- * to another and back again.
+ * Tests all swapXxxx methods for symmetry when going from one endian
+ * to another and back again.
*/
public void testSymmetry() {
assertEquals( (short) 0x0102, EndianUtils.swapShort( EndianUtils.swapShort( (short) 0x0102 ) ) );
@@ -283,7 +283,7 @@ public class EndianUtilsTest extends Tes
public void testUnsignedOverrun() throws Exception {
final byte[] target = new byte[] { 0, 0, 0, (byte)0x80 };
final long expected = 0x80000000L;
-
+
long actual = EndianUtils.readSwappedUnsignedInteger(target, 0);
assertEquals("readSwappedUnsignedInteger(byte[], int) was incorrect", expected, actual);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileCleaningTrackerTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -54,7 +54,7 @@ public class FileCleaningTrackerTestCase
@Override
protected void tearDown() throws Exception {
FileUtils.deleteDirectory(getTestDirectory());
-
+
// reset file cleaner class, so as not to break other tests
/**
@@ -70,29 +70,29 @@ public class FileCleaningTrackerTestCase
theInstance.exitWhenFinished = false;
theInstance.reaper = null;
}
-
+
theInstance = null;
}
//-----------------------------------------------------------------------
public void testFileCleanerFile() throws Exception {
final String path = testFile.getPath();
-
+
assertFalse(testFile.exists());
RandomAccessFile r = new RandomAccessFile(testFile, "rw");
assertTrue(testFile.exists());
-
+
assertEquals(0, theInstance.getTrackCount());
theInstance.track(path, r);
assertEquals(1, theInstance.getTrackCount());
-
+
r.close();
testFile = null;
r = null;
waitUntilTrackCount();
pauseForDeleteToComplete(new File(path));
-
+
assertEquals(0, theInstance.getTrackCount());
assertEquals(showFailures(), false, new File(path).exists());
}
@@ -101,12 +101,12 @@ public class FileCleaningTrackerTestCase
createFile(testFile, 100);
assertTrue(testFile.exists());
assertTrue(getTestDirectory().exists());
-
+
Object obj = new Object();
assertEquals(0, theInstance.getTrackCount());
theInstance.track(getTestDirectory(), obj);
assertEquals(1, theInstance.getTrackCount());
-
+
obj = null;
waitUntilTrackCount();
@@ -120,16 +120,16 @@ public class FileCleaningTrackerTestCase
createFile(testFile, 100);
assertTrue(testFile.exists());
assertTrue(getTestDirectory().exists());
-
+
Object obj = new Object();
assertEquals(0, theInstance.getTrackCount());
theInstance.track(getTestDirectory(), obj, (FileDeleteStrategy) null);
assertEquals(1, theInstance.getTrackCount());
-
+
obj = null;
waitUntilTrackCount();
-
+
assertEquals(0, theInstance.getTrackCount());
assertTrue(testFile.exists()); // not deleted, as dir not empty
assertTrue(testFile.getParentFile().exists()); // not deleted, as dir not empty
@@ -139,17 +139,17 @@ public class FileCleaningTrackerTestCase
createFile(testFile, 100);
assertTrue(testFile.exists());
assertTrue(getTestDirectory().exists());
-
+
Object obj = new Object();
assertEquals(0, theInstance.getTrackCount());
theInstance.track(getTestDirectory(), obj, FileDeleteStrategy.FORCE);
assertEquals(1, theInstance.getTrackCount());
-
+
obj = null;
waitUntilTrackCount();
pauseForDeleteToComplete(testFile.getParentFile());
-
+
assertEquals(0, theInstance.getTrackCount());
assertEquals(showFailures(), false, new File(testFile.getPath()).exists());
assertEquals(showFailures(), false, testFile.getParentFile().exists());
@@ -187,9 +187,9 @@ public class FileCleaningTrackerTestCase
theInstance.exitWhenFinished();
assertTrue(theInstance.exitWhenFinished);
assertEquals(null, theInstance.reaper);
-
+
waitUntilTrackCount();
-
+
assertEquals(0, theInstance.getTrackCount());
assertTrue(theInstance.exitWhenFinished);
assertEquals(null, theInstance.reaper);
@@ -200,7 +200,7 @@ public class FileCleaningTrackerTestCase
theInstance.exitWhenFinished();
assertTrue(theInstance.exitWhenFinished);
assertEquals(null, theInstance.reaper);
-
+
final String path = testFile.getPath();
final Object marker = new Object();
try {
@@ -215,29 +215,29 @@ public class FileCleaningTrackerTestCase
public void testFileCleanerExitWhenFinished1() throws Exception {
final String path = testFile.getPath();
-
+
assertEquals("1-testFile exists", false, testFile.exists());
RandomAccessFile r = new RandomAccessFile(testFile, "rw");
assertEquals("2-testFile exists", true, testFile.exists());
-
+
assertEquals("3-Track Count", 0, theInstance.getTrackCount());
theInstance.track(path, r);
assertEquals("4-Track Count", 1, theInstance.getTrackCount());
assertEquals("5-exitWhenFinished", false, theInstance.exitWhenFinished);
assertEquals("6-reaper.isAlive", true, theInstance.reaper.isAlive());
-
+
assertEquals("7-exitWhenFinished", false, theInstance.exitWhenFinished);
theInstance.exitWhenFinished();
assertEquals("8-exitWhenFinished", true, theInstance.exitWhenFinished);
assertEquals("9-reaper.isAlive", true, theInstance.reaper.isAlive());
-
+
r.close();
testFile = null;
r = null;
waitUntilTrackCount();
pauseForDeleteToComplete(new File(path));
-
+
assertEquals("10-Track Count", 0, theInstance.getTrackCount());
assertEquals("11-testFile exists " + showFailures(), false, new File(path).exists());
assertEquals("12-exitWhenFinished", true, theInstance.exitWhenFinished);
@@ -246,29 +246,29 @@ public class FileCleaningTrackerTestCase
public void testFileCleanerExitWhenFinished2() throws Exception {
final String path = testFile.getPath();
-
+
assertFalse(testFile.exists());
RandomAccessFile r = new RandomAccessFile(testFile, "rw");
assertTrue(testFile.exists());
-
+
assertEquals(0, theInstance.getTrackCount());
theInstance.track(path, r);
assertEquals(1, theInstance.getTrackCount());
assertFalse(theInstance.exitWhenFinished);
assertTrue(theInstance.reaper.isAlive());
-
+
r.close();
testFile = null;
r = null;
waitUntilTrackCount();
pauseForDeleteToComplete(new File(path));
-
+
assertEquals(0, theInstance.getTrackCount());
assertEquals(showFailures(), false, new File(path).exists());
assertFalse(theInstance.exitWhenFinished);
assertTrue(theInstance.reaper.isAlive());
-
+
assertFalse(theInstance.exitWhenFinished);
theInstance.exitWhenFinished();
for (int i = 0; i < 20 && theInstance.reaper.isAlive(); i++) {
@@ -298,7 +298,7 @@ public class FileCleaningTrackerTestCase
}
private void waitUntilTrackCount() throws Exception {
- System.gc();
+ System.gc();
Thread.sleep(500);
int count = 0;
while(theInstance.getTrackCount() != 0 && count++ < 5) {
@@ -311,12 +311,12 @@ public class FileCleaningTrackerTestCase
} catch (final Throwable ignored) {
}
list = null;
- System.gc();
+ System.gc();
Thread.sleep(1000);
}
if (theInstance.getTrackCount() != 0) {
throw new IllegalStateException("Your JVM is not releasing References, try running the testcase with less memory (-Xmx)");
}
-
+
}
}
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -50,7 +50,7 @@ public class FileDeleteStrategyTestCase
assertTrue(subDir.mkdir());
final File subFile = new File(subDir, "a.txt");
createFile(subFile, 16);
-
+
assertTrue(subDir.exists());
assertTrue(subFile.exists());
// delete dir
@@ -80,7 +80,7 @@ public class FileDeleteStrategyTestCase
assertTrue(subDir.mkdir());
final File subFile = new File(subDir, "a.txt");
createFile(subFile, 16);
-
+
assertTrue(subDir.exists());
assertTrue(subFile.exists());
// delete dir
@@ -105,7 +105,7 @@ public class FileDeleteStrategyTestCase
assertTrue(subDir.mkdir());
final File subFile = new File(subDir, "a.txt");
createFile(subFile, 16);
-
+
assertTrue(subDir.exists());
assertTrue(subFile.exists());
// delete dir
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -78,7 +78,7 @@ public class FileSystemUtilsTestCase ext
} finally {
IOUtils.closeQuietly(r);
}
-
+
// now perform the test
@SuppressWarnings("deprecation")
final
@@ -309,7 +309,7 @@ public class FileSystemUtilsTestCase ext
fsu.freeSpaceUnix("", false, true, -1);
fail();
} catch (final IllegalArgumentException ex) {}
-
+
}
public void testGetFreeSpaceUnix_String_NormalResponseLinux() throws Exception {
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -35,7 +35,7 @@ public class FileUtilsFileNewerTestCase
public FileUtilsFileNewerTestCase(final String name) {
super(name);
-
+
m_testFile1 = new File(getTestDirectory(), "file1-test.txt");
m_testFile2 = new File(getTestDirectory(), "file2-test.txt");
}
@@ -99,15 +99,15 @@ public class FileUtilsFileNewerTestCase
* <li>a <code>Date</code> which represents the time reference</li>
* <li>a temporary file with the same last modification date than the time reference</li>
* </ul>
- * Then compares (with the needed <code>isFileNewer</code> method) the last modification date of
- * the specified file with the specified time reference, the created <code>Date</code> and the temporary
+ * Then compares (with the needed <code>isFileNewer</code> method) the last modification date of
+ * the specified file with the specified time reference, the created <code>Date</code> and the temporary
* file.
* <br/>
* The test is successfull if the three comparaisons return the specified wanted result.
*
* @param description describes the tested situation
* @param file the file of which the last modification date is compared
- * @param time the time reference measured in milliseconds since the epoch
+ * @param time the time reference measured in milliseconds since the epoch
*
* @see FileUtils#isFileNewer(File, long)
* @see FileUtils#isFileNewer(File, Date)
@@ -116,7 +116,7 @@ public class FileUtilsFileNewerTestCase
protected void testIsFileNewer(final String description, final File file, final long time, final boolean wantedResult) {
assertEquals(description + " - time", wantedResult, FileUtils.isFileNewer(file, time));
assertEquals(description + " - date", wantedResult, FileUtils.isFileNewer(file, new Date(time)));
-
+
final File temporaryFile = m_testFile2;
temporaryFile.setLastModified(time);
@@ -127,7 +127,7 @@ public class FileUtilsFileNewerTestCase
/**
* Tests the <code>isFileNewer(File, long)</code> method without specifying a <code>File</code>.
* <br/>
- * The test is successfull if the method throws an <code>IllegalArgumentException</code>.
+ * The test is successfull if the method throws an <code>IllegalArgumentException</code>.
*/
public void testIsFileNewerNoFile() {
try {
@@ -139,7 +139,7 @@ public class FileUtilsFileNewerTestCase
/**
* Tests the <code>isFileNewer(File, Date)</code> method without specifying a <code>Date</code>.
* <br/>
- * The test is successfull if the method throws an <code>IllegalArgumentException</code>.
+ * The test is successfull if the method throws an <code>IllegalArgumentException</code>.
*/
public void testIsFileNewerNoDate() {
try {
@@ -151,7 +151,7 @@ public class FileUtilsFileNewerTestCase
/**
* Tests the <code>isFileNewer(File, File)</code> method without specifying a reference <code>File</code>.
* <br/>
- * The test is successfull if the method throws an <code>IllegalArgumentException</code>.
+ * The test is successfull if the method throws an <code>IllegalArgumentException</code>.
*/
public void testIsFileNewerNoFileReference() {
try {
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -33,11 +33,11 @@ public class FileUtilsListFilesTestCase
public FileUtilsListFilesTestCase(final String name) {
super(name);
}
-
+
private File getLocalTestDirectory() {
return new File(getTestDirectory(), "list-files");
}
-
+
/**
* @see junit.framework.TestCase#setUp()
*/
@@ -52,21 +52,21 @@ public class FileUtilsListFilesTestCase
FileUtils.touch(file);
file = new File(dir, "README");
FileUtils.touch(file);
-
+
dir = new File(dir, "subdir1");
dir.mkdirs();
file = new File(dir, "dummy-build.xml");
FileUtils.touch(file);
file = new File(dir, "dummy-readme.txt");
FileUtils.touch(file);
-
+
dir = new File(dir, "subsubdir1");
dir.mkdirs();
file = new File(dir, "dummy-file.txt");
FileUtils.touch(file);
file = new File(dir, "dummy-index.html");
FileUtils.touch(file);
-
+
dir = dir.getParentFile();
dir = new File(dir, "CVS");
dir.mkdirs();
@@ -84,7 +84,7 @@ public class FileUtilsListFilesTestCase
final File dir = getLocalTestDirectory();
FileUtils.deleteDirectory(dir);
}
-
+
private Collection<String> filesToFilenames(final Collection<File> files) {
final Collection<String> filenames = new ArrayList<String>(files.size());
for (final File file : files) {
@@ -92,7 +92,7 @@ public class FileUtilsListFilesTestCase
}
return filenames;
}
-
+
private Collection<String> filesToFilenames(final Iterator<File> files) {
final Collection<String> filenames = new ArrayList<String>();
while (files.hasNext()) {
@@ -100,7 +100,7 @@ public class FileUtilsListFilesTestCase
}
return filenames;
}
-
+
public void testIterateFilesByExtension() throws Exception {
final String[] extensions = { "xml", "txt" };
@@ -127,26 +127,26 @@ public class FileUtilsListFilesTestCase
public void testListFilesByExtension() throws Exception {
final String[] extensions = {"xml", "txt"};
-
+
Collection<File> files = FileUtils.listFiles(getLocalTestDirectory(), extensions, false);
assertEquals(1, files.size());
Collection<String> filenames = filesToFilenames(files);
assertTrue(filenames.contains("dummy-build.xml"));
assertFalse(filenames.contains("README"));
assertFalse(filenames.contains("dummy-file.txt"));
-
+
files = FileUtils.listFiles(getLocalTestDirectory(), extensions, true);
filenames = filesToFilenames(files);
assertEquals(4, filenames.size());
assertTrue(filenames.contains("dummy-file.txt"));
assertFalse(filenames.contains("dummy-index.html"));
-
+
files = FileUtils.listFiles(getLocalTestDirectory(), null, false);
assertEquals(2, files.size());
filenames = filesToFilenames(files);
assertTrue(filenames.contains("dummy-build.xml"));
assertTrue(filenames.contains("README"));
- assertFalse(filenames.contains("dummy-file.txt"));
+ assertFalse(filenames.contains("dummy-file.txt"));
}
public void testListFiles() throws Exception {
@@ -154,7 +154,7 @@ public class FileUtilsListFilesTestCase
Collection<String> filenames;
IOFileFilter fileFilter;
IOFileFilter dirFilter;
-
+
//First, find non-recursively
fileFilter = FileFilterUtils.trueFileFilter();
files = FileUtils.listFiles(getLocalTestDirectory(), fileFilter, (IOFileFilter)null);
@@ -162,7 +162,7 @@ public class FileUtilsListFilesTestCase
assertTrue("'dummy-build.xml' is missing", filenames.contains("dummy-build.xml"));
assertFalse("'dummy-index.html' shouldn't be found", filenames.contains("dummy-index.html"));
assertFalse("'Entries' shouldn't be found", filenames.contains("Entries"));
-
+
//Second, find recursively
fileFilter = FileFilterUtils.trueFileFilter();
dirFilter = FileFilterUtils.notFileFilter(FileFilterUtils.nameFileFilter("CVS"));
@@ -171,7 +171,7 @@ public class FileUtilsListFilesTestCase
assertTrue("'dummy-build.xml' is missing", filenames.contains("dummy-build.xml"));
assertTrue("'dummy-index.html' is missing", filenames.contains("dummy-index.html"));
assertFalse("'Entries' shouldn't be found", filenames.contains("Entries"));
-
+
//Do the same as above but now with the filter coming from FileFilterUtils
fileFilter = FileFilterUtils.trueFileFilter();
dirFilter = FileFilterUtils.makeCVSAware(null);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -30,7 +30,7 @@ import org.apache.commons.io.testtools.F
* @see FilenameUtils
*/
public class FilenameUtilsTestCase extends FileBasedTestCase {
-
+
private static final String SEP = "" + File.separatorChar;
private static final boolean WINDOWS = File.separatorChar == '\\';
@@ -77,14 +77,14 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("1:a"));
assertEquals(null, FilenameUtils.normalize("\\\\\\a\\b\\c.txt"));
assertEquals(null, FilenameUtils.normalize("\\\\a"));
-
+
assertEquals("a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("a\\b/c.txt"));
assertEquals("" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\a\\b/c.txt"));
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("C:\\a\\b/c.txt"));
assertEquals("" + SEP + "" + SEP + "server" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("\\\\server\\a\\b/c.txt"));
assertEquals("~" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("~\\a\\b/c.txt"));
assertEquals("~user" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalize("~user\\a\\b/c.txt"));
-
+
assertEquals("a" + SEP + "c", FilenameUtils.normalize("a/b/../c"));
assertEquals("c", FilenameUtils.normalize("a/b/../../c"));
assertEquals("c" + SEP, FilenameUtils.normalize("a/b/../../c/"));
@@ -106,7 +106,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("../a"));
assertEquals(null, FilenameUtils.normalize(".."));
assertEquals("", FilenameUtils.normalize(""));
-
+
assertEquals(SEP + "a", FilenameUtils.normalize("/a"));
assertEquals(SEP + "a" + SEP, FilenameUtils.normalize("/a/"));
assertEquals(SEP + "a" + SEP + "c", FilenameUtils.normalize("/a/b/../c"));
@@ -124,7 +124,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("/../a"));
assertEquals(null, FilenameUtils.normalize("/.."));
assertEquals(SEP + "", FilenameUtils.normalize("/"));
-
+
assertEquals("~" + SEP + "a", FilenameUtils.normalize("~/a"));
assertEquals("~" + SEP + "a" + SEP, FilenameUtils.normalize("~/a/"));
assertEquals("~" + SEP + "a" + SEP + "c", FilenameUtils.normalize("~/a/b/../c"));
@@ -143,7 +143,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("~/.."));
assertEquals("~" + SEP, FilenameUtils.normalize("~/"));
assertEquals("~" + SEP, FilenameUtils.normalize("~"));
-
+
assertEquals("~user" + SEP + "a", FilenameUtils.normalize("~user/a"));
assertEquals("~user" + SEP + "a" + SEP, FilenameUtils.normalize("~user/a/"));
assertEquals("~user" + SEP + "a" + SEP + "c", FilenameUtils.normalize("~user/a/b/../c"));
@@ -162,7 +162,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("~user/.."));
assertEquals("~user" + SEP, FilenameUtils.normalize("~user/"));
assertEquals("~user" + SEP, FilenameUtils.normalize("~user"));
-
+
assertEquals("C:" + SEP + "a", FilenameUtils.normalize("C:/a"));
assertEquals("C:" + SEP + "a" + SEP, FilenameUtils.normalize("C:/a/"));
assertEquals("C:" + SEP + "a" + SEP + "c", FilenameUtils.normalize("C:/a/b/../c"));
@@ -180,7 +180,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("C:/../a"));
assertEquals(null, FilenameUtils.normalize("C:/.."));
assertEquals("C:" + SEP + "", FilenameUtils.normalize("C:/"));
-
+
assertEquals("C:" + "a", FilenameUtils.normalize("C:a"));
assertEquals("C:" + "a" + SEP, FilenameUtils.normalize("C:a/"));
assertEquals("C:" + "a" + SEP + "c", FilenameUtils.normalize("C:a/b/../c"));
@@ -198,7 +198,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalize("C:../a"));
assertEquals(null, FilenameUtils.normalize("C:.."));
assertEquals("C:" + "", FilenameUtils.normalize("C:"));
-
+
assertEquals(SEP + SEP + "server" + SEP + "a", FilenameUtils.normalize("//server/a"));
assertEquals(SEP + SEP + "server" + SEP + "a" + SEP, FilenameUtils.normalize("//server/a/"));
assertEquals(SEP + SEP + "server" + SEP + "a" + SEP + "c", FilenameUtils.normalize("//server/a/b/../c"));
@@ -238,14 +238,14 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("1:a"));
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("\\\\\\a\\b\\c.txt"));
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("\\\\a"));
-
+
assertEquals("a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("a\\b/c.txt"));
assertEquals("" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("\\a\\b/c.txt"));
assertEquals("C:" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("C:\\a\\b/c.txt"));
assertEquals("" + SEP + "" + SEP + "server" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("\\\\server\\a\\b/c.txt"));
assertEquals("~" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("~\\a\\b/c.txt"));
assertEquals("~user" + SEP + "a" + SEP + "b" + SEP + "c.txt", FilenameUtils.normalizeNoEndSeparator("~user\\a\\b/c.txt"));
-
+
assertEquals("a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("a/b/../c"));
assertEquals("c", FilenameUtils.normalizeNoEndSeparator("a/b/../../c"));
assertEquals("c", FilenameUtils.normalizeNoEndSeparator("a/b/../../c/"));
@@ -267,7 +267,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("../a"));
assertEquals(null, FilenameUtils.normalizeNoEndSeparator(".."));
assertEquals("", FilenameUtils.normalizeNoEndSeparator(""));
-
+
assertEquals(SEP + "a", FilenameUtils.normalizeNoEndSeparator("/a"));
assertEquals(SEP + "a", FilenameUtils.normalizeNoEndSeparator("/a/"));
assertEquals(SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("/a/b/../c"));
@@ -285,7 +285,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("/../a"));
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("/.."));
assertEquals(SEP + "", FilenameUtils.normalizeNoEndSeparator("/"));
-
+
assertEquals("~" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("~/a"));
assertEquals("~" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("~/a/"));
assertEquals("~" + SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("~/a/b/../c"));
@@ -304,7 +304,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("~/.."));
assertEquals("~" + SEP, FilenameUtils.normalizeNoEndSeparator("~/"));
assertEquals("~" + SEP, FilenameUtils.normalizeNoEndSeparator("~"));
-
+
assertEquals("~user" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("~user/a"));
assertEquals("~user" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("~user/a/"));
assertEquals("~user" + SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("~user/a/b/../c"));
@@ -323,7 +323,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("~user/.."));
assertEquals("~user" + SEP, FilenameUtils.normalizeNoEndSeparator("~user/"));
assertEquals("~user" + SEP, FilenameUtils.normalizeNoEndSeparator("~user"));
-
+
assertEquals("C:" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a"));
assertEquals("C:" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("C:/a/"));
assertEquals("C:" + SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:/a/b/../c"));
@@ -341,7 +341,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("C:/../a"));
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("C:/.."));
assertEquals("C:" + SEP + "", FilenameUtils.normalizeNoEndSeparator("C:/"));
-
+
assertEquals("C:" + "a", FilenameUtils.normalizeNoEndSeparator("C:a"));
assertEquals("C:" + "a", FilenameUtils.normalizeNoEndSeparator("C:a/"));
assertEquals("C:" + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("C:a/b/../c"));
@@ -359,7 +359,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("C:../a"));
assertEquals(null, FilenameUtils.normalizeNoEndSeparator("C:.."));
assertEquals("C:" + "", FilenameUtils.normalizeNoEndSeparator("C:"));
-
+
assertEquals(SEP + SEP + "server" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("//server/a"));
assertEquals(SEP + SEP + "server" + SEP + "a", FilenameUtils.normalizeNoEndSeparator("//server/a/"));
assertEquals(SEP + SEP + "server" + SEP + "a" + SEP + "c", FilenameUtils.normalizeNoEndSeparator("//server/a/b/../c"));
@@ -397,29 +397,29 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.concat(null, ""));
assertEquals(null, FilenameUtils.concat(null, "a"));
assertEquals(SEP + "a", FilenameUtils.concat(null, "/a"));
-
+
assertEquals(null, FilenameUtils.concat("", ":")); // invalid prefix
assertEquals(null, FilenameUtils.concat(":", "")); // invalid prefix
-
+
assertEquals("f" + SEP, FilenameUtils.concat("", "f/"));
assertEquals("f", FilenameUtils.concat("", "f"));
assertEquals("a" + SEP + "f" + SEP, FilenameUtils.concat("a/", "f/"));
assertEquals("a" + SEP + "f", FilenameUtils.concat("a", "f"));
assertEquals("a" + SEP + "b" + SEP + "f" + SEP, FilenameUtils.concat("a/b/", "f/"));
assertEquals("a" + SEP + "b" + SEP + "f", FilenameUtils.concat("a/b", "f"));
-
+
assertEquals("a" + SEP + "f" + SEP, FilenameUtils.concat("a/b/", "../f/"));
assertEquals("a" + SEP + "f", FilenameUtils.concat("a/b", "../f"));
assertEquals("a" + SEP + "c" + SEP + "g" + SEP, FilenameUtils.concat("a/b/../c/", "f/../g/"));
assertEquals("a" + SEP + "c" + SEP + "g", FilenameUtils.concat("a/b/../c", "f/../g"));
-
+
assertEquals("a" + SEP + "c.txt" + SEP + "f", FilenameUtils.concat("a/c.txt", "f"));
-
+
assertEquals(SEP + "f" + SEP, FilenameUtils.concat("", "/f/"));
assertEquals(SEP + "f", FilenameUtils.concat("", "/f"));
assertEquals(SEP + "f" + SEP, FilenameUtils.concat("a/", "/f/"));
assertEquals(SEP + "f", FilenameUtils.concat("a", "/f"));
-
+
assertEquals(SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "/c/d"));
assertEquals("C:c" + SEP + "d", FilenameUtils.concat("a/b/", "C:c/d"));
assertEquals("C:" + SEP + "c" + SEP + "d", FilenameUtils.concat("a/b/", "C:/c/d"));
@@ -475,7 +475,7 @@ public class FilenameUtilsTestCase exten
assertEquals(-1, FilenameUtils.getPrefixLength("1:a"));
assertEquals(-1, FilenameUtils.getPrefixLength("\\\\\\a\\b\\c.txt"));
assertEquals(-1, FilenameUtils.getPrefixLength("\\\\a"));
-
+
assertEquals(0, FilenameUtils.getPrefixLength(""));
assertEquals(1, FilenameUtils.getPrefixLength("\\"));
assertEquals(2, FilenameUtils.getPrefixLength("C:"));
@@ -485,20 +485,20 @@ public class FilenameUtilsTestCase exten
assertEquals(2, FilenameUtils.getPrefixLength("~/"));
assertEquals(6, FilenameUtils.getPrefixLength("~user"));
assertEquals(6, FilenameUtils.getPrefixLength("~user/"));
-
+
assertEquals(0, FilenameUtils.getPrefixLength("a\\b\\c.txt"));
assertEquals(1, FilenameUtils.getPrefixLength("\\a\\b\\c.txt"));
assertEquals(2, FilenameUtils.getPrefixLength("C:a\\b\\c.txt"));
assertEquals(3, FilenameUtils.getPrefixLength("C:\\a\\b\\c.txt"));
assertEquals(9, FilenameUtils.getPrefixLength("\\\\server\\a\\b\\c.txt"));
-
+
assertEquals(0, FilenameUtils.getPrefixLength("a/b/c.txt"));
assertEquals(1, FilenameUtils.getPrefixLength("/a/b/c.txt"));
assertEquals(3, FilenameUtils.getPrefixLength("C:/a/b/c.txt"));
assertEquals(9, FilenameUtils.getPrefixLength("//server/a/b/c.txt"));
assertEquals(2, FilenameUtils.getPrefixLength("~/a/b/c.txt"));
assertEquals(6, FilenameUtils.getPrefixLength("~user/a/b/c.txt"));
-
+
assertEquals(0, FilenameUtils.getPrefixLength("a\\b\\c.txt"));
assertEquals(1, FilenameUtils.getPrefixLength("\\a\\b\\c.txt"));
assertEquals(2, FilenameUtils.getPrefixLength("~\\a\\b\\c.txt"));
@@ -508,7 +508,7 @@ public class FilenameUtilsTestCase exten
assertEquals(-1, FilenameUtils.getPrefixLength("\\\\\\a\\b\\c.txt"));
assertEquals(-1, FilenameUtils.getPrefixLength("///a/b/c.txt"));
}
-
+
public void testIndexOfLastSeparator() {
assertEquals(-1, FilenameUtils.indexOfLastSeparator(null));
assertEquals(-1, FilenameUtils.indexOfLastSeparator("noseperator.inthispath"));
@@ -536,7 +536,7 @@ public class FilenameUtilsTestCase exten
assertEquals(null, FilenameUtils.getPrefix("1:a"));
assertEquals(null, FilenameUtils.getPrefix("\\\\\\a\\b\\c.txt"));
assertEquals(null, FilenameUtils.getPrefix("\\\\a"));
-
+
assertEquals("", FilenameUtils.getPrefix(""));
assertEquals("\\", FilenameUtils.getPrefix("\\"));
assertEquals("C:", FilenameUtils.getPrefix("C:"));
@@ -546,19 +546,19 @@ public class FilenameUtilsTestCase exten
assertEquals("~/", FilenameUtils.getPrefix("~/"));
assertEquals("~user/", FilenameUtils.getPrefix("~user"));
assertEquals("~user/", FilenameUtils.getPrefix("~user/"));
-
+
assertEquals("", FilenameUtils.getPrefix("a\\b\\c.txt"));
assertEquals("\\", FilenameUtils.getPrefix("\\a\\b\\c.txt"));
assertEquals("C:\\", FilenameUtils.getPrefix("C:\\a\\b\\c.txt"));
assertEquals("\\\\server\\", FilenameUtils.getPrefix("\\\\server\\a\\b\\c.txt"));
-
+
assertEquals("", FilenameUtils.getPrefix("a/b/c.txt"));
assertEquals("/", FilenameUtils.getPrefix("/a/b/c.txt"));
assertEquals("C:/", FilenameUtils.getPrefix("C:/a/b/c.txt"));
assertEquals("//server/", FilenameUtils.getPrefix("//server/a/b/c.txt"));
assertEquals("~/", FilenameUtils.getPrefix("~/a/b/c.txt"));
assertEquals("~user/", FilenameUtils.getPrefix("~user/a/b/c.txt"));
-
+
assertEquals("", FilenameUtils.getPrefix("a\\b\\c.txt"));
assertEquals("\\", FilenameUtils.getPrefix("\\a\\b\\c.txt"));
assertEquals("~\\", FilenameUtils.getPrefix("~\\a\\b\\c.txt"));
@@ -574,14 +574,14 @@ public class FilenameUtilsTestCase exten
assertEquals("a/b/", FilenameUtils.getPath("a/b/c"));
assertEquals("a/b/c/", FilenameUtils.getPath("a/b/c/"));
assertEquals("a\\b\\", FilenameUtils.getPath("a\\b\\c"));
-
+
assertEquals(null, FilenameUtils.getPath(":"));
assertEquals(null, FilenameUtils.getPath("1:/a/b/c.txt"));
assertEquals(null, FilenameUtils.getPath("1:"));
assertEquals(null, FilenameUtils.getPath("1:a"));
assertEquals(null, FilenameUtils.getPath("///a/b/c.txt"));
assertEquals(null, FilenameUtils.getPath("//a"));
-
+
assertEquals("", FilenameUtils.getPath(""));
assertEquals("", FilenameUtils.getPath("C:"));
assertEquals("", FilenameUtils.getPath("C:/"));
@@ -590,7 +590,7 @@ public class FilenameUtilsTestCase exten
assertEquals("", FilenameUtils.getPath("~/"));
assertEquals("", FilenameUtils.getPath("~user"));
assertEquals("", FilenameUtils.getPath("~user/"));
-
+
assertEquals("a/b/", FilenameUtils.getPath("a/b/c.txt"));
assertEquals("a/b/", FilenameUtils.getPath("/a/b/c.txt"));
assertEquals("", FilenameUtils.getPath("C:a"));
@@ -610,14 +610,14 @@ public class FilenameUtilsTestCase exten
assertEquals("a/b", FilenameUtils.getPathNoEndSeparator("a/b/c"));
assertEquals("a/b/c", FilenameUtils.getPathNoEndSeparator("a/b/c/"));
assertEquals("a\\b", FilenameUtils.getPathNoEndSeparator("a\\b\\c"));
-
+
assertEquals(null, FilenameUtils.getPathNoEndSeparator(":"));
assertEquals(null, FilenameUtils.getPathNoEndSeparator("1:/a/b/c.txt"));
assertEquals(null, FilenameUtils.getPathNoEndSeparator("1:"));
assertEquals(null, FilenameUtils.getPathNoEndSeparator("1:a"));
assertEquals(null, FilenameUtils.getPathNoEndSeparator("///a/b/c.txt"));
assertEquals(null, FilenameUtils.getPathNoEndSeparator("//a"));
-
+
assertEquals("", FilenameUtils.getPathNoEndSeparator(""));
assertEquals("", FilenameUtils.getPathNoEndSeparator("C:"));
assertEquals("", FilenameUtils.getPathNoEndSeparator("C:/"));
@@ -626,7 +626,7 @@ public class FilenameUtilsTestCase exten
assertEquals("", FilenameUtils.getPathNoEndSeparator("~/"));
assertEquals("", FilenameUtils.getPathNoEndSeparator("~user"));
assertEquals("", FilenameUtils.getPathNoEndSeparator("~user/"));
-
+
assertEquals("a/b", FilenameUtils.getPathNoEndSeparator("a/b/c.txt"));
assertEquals("a/b", FilenameUtils.getPathNoEndSeparator("/a/b/c.txt"));
assertEquals("", FilenameUtils.getPathNoEndSeparator("C:a"));
@@ -644,14 +644,14 @@ public class FilenameUtilsTestCase exten
assertEquals("a/b/", FilenameUtils.getFullPath("a/b/c"));
assertEquals("a/b/c/", FilenameUtils.getFullPath("a/b/c/"));
assertEquals("a\\b\\", FilenameUtils.getFullPath("a\\b\\c"));
-
+
assertEquals(null, FilenameUtils.getFullPath(":"));
assertEquals(null, FilenameUtils.getFullPath("1:/a/b/c.txt"));
assertEquals(null, FilenameUtils.getFullPath("1:"));
assertEquals(null, FilenameUtils.getFullPath("1:a"));
assertEquals(null, FilenameUtils.getFullPath("///a/b/c.txt"));
assertEquals(null, FilenameUtils.getFullPath("//a"));
-
+
assertEquals("", FilenameUtils.getFullPath(""));
assertEquals("C:", FilenameUtils.getFullPath("C:"));
assertEquals("C:/", FilenameUtils.getFullPath("C:/"));
@@ -660,7 +660,7 @@ public class FilenameUtilsTestCase exten
assertEquals("~/", FilenameUtils.getFullPath("~/"));
assertEquals("~user/", FilenameUtils.getFullPath("~user"));
assertEquals("~user/", FilenameUtils.getFullPath("~user/"));
-
+
assertEquals("a/b/", FilenameUtils.getFullPath("a/b/c.txt"));
assertEquals("/a/b/", FilenameUtils.getFullPath("/a/b/c.txt"));
assertEquals("C:", FilenameUtils.getFullPath("C:a"));
@@ -678,14 +678,14 @@ public class FilenameUtilsTestCase exten
assertEquals("a/b", FilenameUtils.getFullPathNoEndSeparator("a/b/c"));
assertEquals("a/b/c", FilenameUtils.getFullPathNoEndSeparator("a/b/c/"));
assertEquals("a\\b", FilenameUtils.getFullPathNoEndSeparator("a\\b\\c"));
-
+
assertEquals(null, FilenameUtils.getFullPathNoEndSeparator(":"));
assertEquals(null, FilenameUtils.getFullPathNoEndSeparator("1:/a/b/c.txt"));
assertEquals(null, FilenameUtils.getFullPathNoEndSeparator("1:"));
assertEquals(null, FilenameUtils.getFullPathNoEndSeparator("1:a"));
assertEquals(null, FilenameUtils.getFullPathNoEndSeparator("///a/b/c.txt"));
assertEquals(null, FilenameUtils.getFullPathNoEndSeparator("//a"));
-
+
assertEquals("", FilenameUtils.getFullPathNoEndSeparator(""));
assertEquals("C:", FilenameUtils.getFullPathNoEndSeparator("C:"));
assertEquals("C:/", FilenameUtils.getFullPathNoEndSeparator("C:/"));
@@ -694,7 +694,7 @@ public class FilenameUtilsTestCase exten
assertEquals("~/", FilenameUtils.getFullPathNoEndSeparator("~/"));
assertEquals("~user", FilenameUtils.getFullPathNoEndSeparator("~user"));
assertEquals("~user/", FilenameUtils.getFullPathNoEndSeparator("~user/"));
-
+
assertEquals("a/b", FilenameUtils.getFullPathNoEndSeparator("a/b/c.txt"));
assertEquals("/a/b", FilenameUtils.getFullPathNoEndSeparator("/a/b/c.txt"));
assertEquals("C:", FilenameUtils.getFullPathNoEndSeparator("C:a"));
@@ -858,27 +858,27 @@ public class FilenameUtilsTestCase exten
assertTrue(FilenameUtils.isExtension("file", ""));
assertTrue(FilenameUtils.isExtension("file.txt", "txt"));
assertFalse(FilenameUtils.isExtension("file.txt", "rtf"));
-
+
assertFalse(FilenameUtils.isExtension("a/b/file.txt", (String) null));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", ""));
assertTrue(FilenameUtils.isExtension("a/b/file.txt", "txt"));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", "rtf"));
-
+
assertFalse(FilenameUtils.isExtension("a.b/file.txt", (String) null));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", ""));
assertTrue(FilenameUtils.isExtension("a.b/file.txt", "txt"));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", "rtf"));
-
+
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", (String) null));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", ""));
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", "txt"));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", "rtf"));
-
+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", (String) null));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", ""));
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", "txt"));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", "rtf"));
-
+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", "TXT"));
}
@@ -891,31 +891,31 @@ public class FilenameUtilsTestCase exten
assertFalse(FilenameUtils.isExtension("file.txt", new String[] {"rtf"}));
assertTrue(FilenameUtils.isExtension("file", new String[] {"rtf", ""}));
assertTrue(FilenameUtils.isExtension("file.txt", new String[] {"rtf", "txt"}));
-
+
assertFalse(FilenameUtils.isExtension("a/b/file.txt", (String[]) null));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new String[0]));
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new String[] {"txt"}));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new String[] {"rtf"}));
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new String[] {"rtf", "txt"}));
-
+
assertFalse(FilenameUtils.isExtension("a.b/file.txt", (String[]) null));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new String[0]));
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new String[] {"txt"}));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new String[] {"rtf"}));
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new String[] {"rtf", "txt"}));
-
+
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", (String[]) null));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new String[0]));
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new String[] {"txt"}));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new String[] {"rtf"}));
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new String[] {"rtf", "txt"}));
-
+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", (String[]) null));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new String[0]));
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new String[] {"txt"}));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new String[] {"rtf"}));
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new String[] {"rtf", "txt"}));
-
+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new String[] {"TXT"}));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new String[] {"TXT", "RTF"}));
}
@@ -929,31 +929,31 @@ public class FilenameUtilsTestCase exten
assertFalse(FilenameUtils.isExtension("file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf"}))));
assertTrue(FilenameUtils.isExtension("file", new ArrayList<String>(Arrays.asList(new String[] {"rtf", ""}))));
assertTrue(FilenameUtils.isExtension("file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf", "txt"}))));
-
+
assertFalse(FilenameUtils.isExtension("a/b/file.txt", (Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<String>()));
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<String>(Arrays.asList(new String[] {"txt"}))));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf"}))));
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf", "txt"}))));
-
+
assertFalse(FilenameUtils.isExtension("a.b/file.txt", (Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<String>()));
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<String>(Arrays.asList(new String[] {"txt"}))));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf"}))));
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf", "txt"}))));
-
+
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", (Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<String>()));
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"txt"}))));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf"}))));
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf", "txt"}))));
-
+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", (Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>()));
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"txt"}))));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf"}))));
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"rtf", "txt"}))));
-
+
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"TXT"}))));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new ArrayList<String>(Arrays.asList(new String[] {"TXT", "RTF"}))));
}
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -100,7 +100,7 @@ public class FilenameUtilsWildcardTestCa
assertTrue(FilenameUtils.wildcardMatch("BarFoo", "*Foo", IOCase.SENSITIVE));
assertTrue(FilenameUtils.wildcardMatch("Foo", "Foo*", IOCase.SENSITIVE));
assertTrue(FilenameUtils.wildcardMatch("FooBar", "Foo*", IOCase.SENSITIVE));
-
+
assertFalse(FilenameUtils.wildcardMatch("FOO", "*Foo", IOCase.SENSITIVE));
assertFalse(FilenameUtils.wildcardMatch("BARFOO", "*Foo", IOCase.SENSITIVE));
assertFalse(FilenameUtils.wildcardMatch("FOO", "Foo*", IOCase.SENSITIVE));
@@ -166,7 +166,7 @@ public class FilenameUtilsWildcardTestCa
assertMatch("log.txt", "log?*", true);
assertMatch("log.txt12", "log.txt??", true);
-
+
assertMatch("log.log", "log**log", true);
assertMatch("log.log", "log**", true);
assertMatch("log.log", "log.**", true);
@@ -178,7 +178,7 @@ public class FilenameUtilsWildcardTestCa
assertMatch("log.log", "log.*", true);
assertMatch("log.log", "*.log", true);
assertMatch("log.log", "*log", true);
-
+
assertMatch("log.log", "*log?", false);
assertMatch("log.log", "*log?*", true);
assertMatch("log.log.abc", "*log?abc", true);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOCaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOCaseTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOCaseTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOCaseTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -92,7 +92,7 @@ public class IOCaseTestCase extends File
assertTrue(IOCase.SENSITIVE.checkCompareTo("DEF", "ABC") > 0);
assertEquals(0, IOCase.SENSITIVE.checkCompareTo("ABC", "ABC"));
assertEquals(0, IOCase.SENSITIVE.checkCompareTo("", ""));
-
+
try {
IOCase.SENSITIVE.checkCompareTo("ABC", null);
fail();
@@ -111,7 +111,7 @@ public class IOCaseTestCase extends File
assertEquals(0, IOCase.SENSITIVE.checkCompareTo("ABC", "ABC"));
assertTrue(IOCase.SENSITIVE.checkCompareTo("ABC", "abc") < 0);
assertTrue(IOCase.SENSITIVE.checkCompareTo("abc", "ABC") > 0);
-
+
assertEquals(0, IOCase.INSENSITIVE.checkCompareTo("ABC", "ABC"));
assertEquals(0, IOCase.INSENSITIVE.checkCompareTo("ABC", "abc"));
assertEquals(0, IOCase.INSENSITIVE.checkCompareTo("abc", "ABC"));
@@ -133,7 +133,7 @@ public class IOCaseTestCase extends File
assertFalse(IOCase.SENSITIVE.checkEquals("ABC", "ABCD"));
assertFalse(IOCase.SENSITIVE.checkEquals("", "ABC"));
assertTrue(IOCase.SENSITIVE.checkEquals("", ""));
-
+
try {
IOCase.SENSITIVE.checkEquals("ABC", null);
fail();
@@ -151,10 +151,10 @@ public class IOCaseTestCase extends File
public void test_checkEquals_case() throws Exception {
assertTrue(IOCase.SENSITIVE.checkEquals("ABC", "ABC"));
assertFalse(IOCase.SENSITIVE.checkEquals("ABC", "Abc"));
-
+
assertTrue(IOCase.INSENSITIVE.checkEquals("ABC", "ABC"));
assertTrue(IOCase.INSENSITIVE.checkEquals("ABC", "Abc"));
-
+
assertTrue(IOCase.SYSTEM.checkEquals("ABC", "ABC"));
assertEquals(WINDOWS, IOCase.SYSTEM.checkEquals("ABC", "Abc"));
}
@@ -170,7 +170,7 @@ public class IOCaseTestCase extends File
assertFalse(IOCase.SENSITIVE.checkStartsWith("ABC", "ABCD"));
assertFalse(IOCase.SENSITIVE.checkStartsWith("", "ABC"));
assertTrue(IOCase.SENSITIVE.checkStartsWith("", ""));
-
+
try {
IOCase.SENSITIVE.checkStartsWith("ABC", null);
fail();
@@ -188,10 +188,10 @@ public class IOCaseTestCase extends File
public void test_checkStartsWith_case() throws Exception {
assertTrue(IOCase.SENSITIVE.checkStartsWith("ABC", "AB"));
assertFalse(IOCase.SENSITIVE.checkStartsWith("ABC", "Ab"));
-
+
assertTrue(IOCase.INSENSITIVE.checkStartsWith("ABC", "AB"));
assertTrue(IOCase.INSENSITIVE.checkStartsWith("ABC", "Ab"));
-
+
assertTrue(IOCase.SYSTEM.checkStartsWith("ABC", "AB"));
assertEquals(WINDOWS, IOCase.SYSTEM.checkStartsWith("ABC", "Ab"));
}
@@ -207,7 +207,7 @@ public class IOCaseTestCase extends File
assertFalse(IOCase.SENSITIVE.checkEndsWith("ABC", "ABCD"));
assertFalse(IOCase.SENSITIVE.checkEndsWith("", "ABC"));
assertTrue(IOCase.SENSITIVE.checkEndsWith("", ""));
-
+
try {
IOCase.SENSITIVE.checkEndsWith("ABC", null);
fail();
@@ -225,10 +225,10 @@ public class IOCaseTestCase extends File
public void test_checkEndsWith_case() throws Exception {
assertTrue(IOCase.SENSITIVE.checkEndsWith("ABC", "BC"));
assertFalse(IOCase.SENSITIVE.checkEndsWith("ABC", "Bc"));
-
+
assertTrue(IOCase.INSENSITIVE.checkEndsWith("ABC", "BC"));
assertTrue(IOCase.INSENSITIVE.checkEndsWith("ABC", "Bc"));
-
+
assertTrue(IOCase.SYSTEM.checkEndsWith("ABC", "BC"));
assertEquals(WINDOWS, IOCase.SYSTEM.checkEndsWith("ABC", "Bc"));
}
@@ -289,10 +289,10 @@ public class IOCaseTestCase extends File
public void test_checkIndexOf_case() throws Exception {
assertEquals(1, IOCase.SENSITIVE.checkIndexOf("ABC", 0, "BC"));
assertEquals(-1, IOCase.SENSITIVE.checkIndexOf("ABC", 0, "Bc"));
-
+
assertEquals(1, IOCase.INSENSITIVE.checkIndexOf("ABC", 0, "BC"));
assertEquals(1, IOCase.INSENSITIVE.checkIndexOf("ABC", 0, "Bc"));
-
+
assertEquals(1, IOCase.SYSTEM.checkIndexOf("ABC", 0, "BC"));
assertEquals(WINDOWS ? 1 : -1, IOCase.SYSTEM.checkIndexOf("ABC", 0, "Bc"));
}
@@ -308,7 +308,7 @@ public class IOCaseTestCase extends File
assertFalse(IOCase.SENSITIVE.checkRegionMatches("ABC", 0, "ABCD"));
assertFalse(IOCase.SENSITIVE.checkRegionMatches("", 0, "ABC"));
assertTrue(IOCase.SENSITIVE.checkRegionMatches("", 0, ""));
-
+
assertTrue(IOCase.SENSITIVE.checkRegionMatches("ABC", 1, ""));
assertFalse(IOCase.SENSITIVE.checkRegionMatches("ABC", 1, "A"));
assertFalse(IOCase.SENSITIVE.checkRegionMatches("ABC", 1, "AB"));
@@ -318,7 +318,7 @@ public class IOCaseTestCase extends File
assertFalse(IOCase.SENSITIVE.checkRegionMatches("ABC", 1, "ABCD"));
assertFalse(IOCase.SENSITIVE.checkRegionMatches("", 1, "ABC"));
assertFalse(IOCase.SENSITIVE.checkRegionMatches("", 1, ""));
-
+
try {
IOCase.SENSITIVE.checkRegionMatches("ABC", 0, null);
fail();
@@ -348,10 +348,10 @@ public class IOCaseTestCase extends File
public void test_checkRegionMatches_case() throws Exception {
assertTrue(IOCase.SENSITIVE.checkRegionMatches("ABC", 0, "AB"));
assertFalse(IOCase.SENSITIVE.checkRegionMatches("ABC", 0, "Ab"));
-
+
assertTrue(IOCase.INSENSITIVE.checkRegionMatches("ABC", 0, "AB"));
assertTrue(IOCase.INSENSITIVE.checkRegionMatches("ABC", 0, "Ab"));
-
+
assertTrue(IOCase.SYSTEM.checkRegionMatches("ABC", 0, "AB"));
assertEquals(WINDOWS, IOCase.SYSTEM.checkRegionMatches("ABC", 0, "Ab"));
}
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -36,7 +36,7 @@ import org.apache.commons.io.testtools.Y
/**
* JUnit tests for IOUtils copy methods.
- *
+ *
* @version $Id$
* @see IOUtils
*/
@@ -80,7 +80,7 @@ public class IOUtilsCopyTestCase extends
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
final int count = IOUtils.copy(in, out);
-
+
assertEquals("Not all bytes were read", 0, in.available());
assertEquals("Sizes differ", inData.length, baout.size());
assertTrue("Content differs", Arrays.equals(inData, baout.toByteArray()));
@@ -114,7 +114,7 @@ public class IOUtilsCopyTestCase extends
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
final long count = IOUtils.copy(in, out, bufferSize);
-
+
assertEquals("Not all bytes were read", 0, in.available());
assertEquals("Sizes differ", inData.length, baout.size());
assertTrue("Content differs", Arrays.equals(inData, baout.toByteArray()));
@@ -164,7 +164,7 @@ public class IOUtilsCopyTestCase extends
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.copy(in, writer); // deliberately testing deprecated method
out.off();
writer.flush();
@@ -203,7 +203,7 @@ public class IOUtilsCopyTestCase extends
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.copy(in, writer, "UTF8");
out.off();
writer.flush();
@@ -240,7 +240,7 @@ public class IOUtilsCopyTestCase extends
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.copy(in, writer, (String) null);
out.off();
writer.flush();
@@ -256,10 +256,10 @@ public class IOUtilsCopyTestCase extends
InputStream in = new ByteArrayInputStream(inData);
in = new YellOnCloseInputStream(in);
final Reader reader = new InputStreamReader(in, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.copy(reader, out); // deliberately testing deprecated method
//Note: this method *does* flush. It is equivalent to:
// OutputStreamWriter _out = new OutputStreamWriter(fout);
@@ -299,14 +299,14 @@ public class IOUtilsCopyTestCase extends
InputStream in = new ByteArrayInputStream(inData);
in = new YellOnCloseInputStream(in);
final Reader reader = new InputStreamReader(in, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
IOUtils.copy(reader, out, "UTF16");
// note: this method *does* flush.
// note: we don't flush here; this IOUtils method does it for us
-
+
byte[] bytes = baout.toByteArray();
bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
assertTrue("Content differs", Arrays.equals(inData, bytes));
@@ -337,7 +337,7 @@ public class IOUtilsCopyTestCase extends
InputStream in = new ByteArrayInputStream(inData);
in = new YellOnCloseInputStream(in);
final Reader reader = new InputStreamReader(in, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final OutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java Wed Apr 24 23:20:29 2013
@@ -5,9 +5,9 @@
* 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.
@@ -125,7 +125,7 @@ public class IOUtilsTestCase extends Fil
}
public void testCloseQuietly_CloseableIOException() {
- IOUtils.closeQuietly(new Closeable() {
+ IOUtils.closeQuietly(new Closeable() {
public void close() throws IOException {
throw new IOException();
}
@@ -174,7 +174,7 @@ public class IOUtilsTestCase extends Fil
}
public void testCloseQuietly_ServerSocketIOException() throws IOException {
- IOUtils.closeQuietly(new ServerSocket() {
+ IOUtils.closeQuietly(new ServerSocket() {
@Override
public void close() throws IOException {
throw new IOException();
@@ -188,7 +188,7 @@ public class IOUtilsTestCase extends Fil
}
public void testCloseQuietly_SocketIOException() {
- IOUtils.closeQuietly(new Socket() {
+ IOUtils.closeQuietly(new Socket() {
@Override
public synchronized void close() throws IOException {
throw new IOException();
@@ -307,7 +307,7 @@ public class IOUtilsTestCase extends Fil
}
deleteFile(destination);
}
-
+
@SuppressWarnings("deprecation")
// testing deprecated method
public void testCopy_ByteArray_Writer() throws Exception {
@@ -1065,7 +1065,7 @@ public class IOUtilsTestCase extends Fil
fin.close();
}
}
-
+
public void testToCharArray_Reader() throws Exception {
final FileReader fr = new FileReader(m_testFile);
try {
@@ -1077,12 +1077,12 @@ public class IOUtilsTestCase extends Fil
fr.close();
}
}
-
+
/**
* Test for {@link IOUtils#toInputStream(CharSequence)} and {@link IOUtils#toInputStream(CharSequence, String)}.
* Note, this test utilizes on {@link IOUtils#toByteArray(java.io.InputStream)} and so relies on
* {@link #testToByteArray_InputStream()} to ensure this method functions correctly.
- *
+ *
* @throws Exception
* on error
*/
@@ -1102,12 +1102,12 @@ public class IOUtilsTestCase extends Fil
}
// Tests from IO-305
-
+
/**
* Test for {@link IOUtils#toInputStream(String)} and {@link IOUtils#toInputStream(String, String)}. Note, this test
* utilizes on {@link IOUtils#toByteArray(java.io.InputStream)} and so relies on
* {@link #testToByteArray_InputStream()} to ensure this method functions correctly.
- *
+ *
* @throws Exception
* on error
*/
@@ -1125,7 +1125,7 @@ public class IOUtilsTestCase extends Fil
bytes = IOUtils.toByteArray(inStream);
assertEqualContent(str.getBytes("UTF-8"), bytes);
}
-
+
@SuppressWarnings("deprecation")
// testing deprecated method
public void testToString_ByteArray() throws Exception {
@@ -1209,7 +1209,7 @@ public class IOUtilsTestCase extends Fil
public void testToString_URL_CharsetNameNull() throws Exception {
testToString_URL(null);
}
-
+
public void testAsBufferedNull() {
try {
IOUtils.asBufferedInputStream(null);