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 [2/3] - in
/commons/proper/io/trunk/src/test/java/org/apache/commons/io: ./
filefilter/ input/ monitor/ output/ testtools/
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.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.
@@ -28,7 +28,7 @@ import org.apache.commons.io.testtools.Y
/**
* JUnit tests for IOUtils write methods.
- *
+ *
* @version $Id$
* @see IOUtils
*/
@@ -64,7 +64,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_byteArrayToOutputStream() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write(inData, out);
out.off();
out.flush();
@@ -76,7 +76,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_byteArrayToOutputStream_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((byte[]) null, out);
out.off();
out.flush();
@@ -97,7 +97,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write(inData, writer);
out.off();
writer.flush();
@@ -111,7 +111,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write((byte[]) null, writer);
out.off();
writer.flush();
@@ -132,7 +132,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write(inData, writer, "UTF8");
out.off();
writer.flush();
@@ -147,7 +147,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write((byte[]) null, writer, "UTF8");
out.off();
writer.flush();
@@ -167,25 +167,25 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write(inData, writer, (String) null);
out.off();
writer.flush();
-
+
assertEquals("Sizes differ", inData.length, baout.size());
assertTrue("Content differs", Arrays.equals(inData, baout.toByteArray()));
}
//-----------------------------------------------------------------------
public void testWrite_charSequenceToOutputStream() throws Exception {
final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write(csq, out);
out.off();
out.flush();
-
+
assertEquals("Sizes differ", inData.length, baout.size());
assertTrue("Content differs", Arrays.equals(inData, baout.toByteArray()));
}
@@ -193,7 +193,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_charSequenceToOutputStream_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((CharSequence) null, out);
out.off();
out.flush();
@@ -212,14 +212,14 @@ public class IOUtilsWriteTestCase extend
//-----------------------------------------------------------------------
public void testWrite_charSequenceToOutputStream_Encoding() throws Exception {
final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
IOUtils.write(csq, out, "UTF16");
out.off();
out.flush();
-
+
byte[] bytes = baout.toByteArray();
bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
assertTrue("Content differs", Arrays.equals(inData, bytes));
@@ -228,7 +228,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_charSequenceToOutputStream_Encoding_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((CharSequence) null, out);
out.off();
out.flush();
@@ -246,7 +246,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_charSequenceToOutputStream_nullEncoding() throws Exception {
final CharSequence csq = new StringBuilder(new String(inData, "US-ASCII"));
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
@@ -280,7 +280,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write((CharSequence) null, writer);
out.off();
writer.flush();
@@ -298,14 +298,14 @@ public class IOUtilsWriteTestCase extend
//-----------------------------------------------------------------------
public void testWrite_stringToOutputStream() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write(str, out);
out.off();
out.flush();
-
+
assertEquals("Sizes differ", inData.length, baout.size());
assertTrue("Content differs", Arrays.equals(inData, baout.toByteArray()));
}
@@ -313,7 +313,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_stringToOutputStream_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((String) null, out);
out.off();
out.flush();
@@ -332,14 +332,14 @@ public class IOUtilsWriteTestCase extend
//-----------------------------------------------------------------------
public void testWrite_stringToOutputStream_Encoding() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
IOUtils.write(str, out, "UTF16");
out.off();
out.flush();
-
+
byte[] bytes = baout.toByteArray();
bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
assertTrue("Content differs", Arrays.equals(inData, bytes));
@@ -348,7 +348,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_stringToOutputStream_Encoding_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((String) null, out);
out.off();
out.flush();
@@ -366,7 +366,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_stringToOutputStream_nullEncoding() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
@@ -400,7 +400,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write((String) null, writer);
out.off();
writer.flush();
@@ -419,7 +419,7 @@ public class IOUtilsWriteTestCase extend
//-----------------------------------------------------------------------
public void testWrite_charArrayToOutputStream() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
@@ -434,7 +434,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_charArrayToOutputStream_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((char[]) null, out);
out.off();
out.flush();
@@ -453,14 +453,14 @@ public class IOUtilsWriteTestCase extend
//-----------------------------------------------------------------------
public void testWrite_charArrayToOutputStream_Encoding() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
IOUtils.write(str.toCharArray(), out, "UTF16");
out.off();
out.flush();
-
+
byte[] bytes = baout.toByteArray();
bytes = new String(bytes, "UTF16").getBytes("US-ASCII");
assertTrue("Content differs", Arrays.equals(inData, bytes));
@@ -469,7 +469,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_charArrayToOutputStream_Encoding_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
-
+
IOUtils.write((char[]) null, out);
out.off();
out.flush();
@@ -487,7 +487,7 @@ public class IOUtilsWriteTestCase extend
public void testWrite_charArrayToOutputStream_nullEncoding() throws Exception {
final String str = new String(inData, "US-ASCII");
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
@@ -521,7 +521,7 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.write((char[]) null, writer);
out.off();
writer.flush();
@@ -542,15 +542,15 @@ public class IOUtilsWriteTestCase extend
final Object[] data = new Object[] {
"hello", new StringBuffer("world"), "", "this is", null, "some text"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines(list, "*", out);
-
+
out.off();
out.flush();
-
+
final String expected = "hello*world**this is**some text*";
final String actual = baout.toString();
assertEquals(expected, actual);
@@ -559,25 +559,25 @@ public class IOUtilsWriteTestCase extend
public void testWriteLines_OutputStream_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines((List<?>) null, "*", out);
out.off();
out.flush();
-
+
assertEquals("Sizes differ", 0, baout.size());
}
public void testWriteLines_OutputStream_nullSeparator() throws Exception {
final Object[] data = new Object[] {"hello", "world"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines(list, (String) null, out);
out.off();
out.flush();
-
+
final String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
final String actual = baout.toString();
assertEquals(expected, actual);
@@ -597,15 +597,15 @@ public class IOUtilsWriteTestCase extend
final Object[] data = new Object[] {
"hello\u8364", new StringBuffer("world"), "", "this is", null, "some text"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines(list, "*", out, "UTF-8");
-
+
out.off();
out.flush();
-
+
final String expected = "hello\u8364*world**this is**some text*";
final String actual = baout.toString("UTF-8");
assertEquals(expected, actual);
@@ -614,25 +614,25 @@ public class IOUtilsWriteTestCase extend
public void testWriteLines_OutputStream_Encoding_nullData() throws Exception {
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines((List<?>) null, "*", out, "US-ASCII");
out.off();
out.flush();
-
+
assertEquals("Sizes differ", 0, baout.size());
}
public void testWriteLines_OutputStream_Encoding_nullSeparator() throws Exception {
final Object[] data = new Object[] {"hello", "world"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines(list, (String) null, out, "US-ASCII");
out.off();
out.flush();
-
+
final String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
final String actual = baout.toString();
assertEquals(expected, actual);
@@ -651,15 +651,15 @@ public class IOUtilsWriteTestCase extend
final Object[] data = new Object[] {
"hello", new StringBuffer("world"), "", "this is", null, "some text"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, false, true);
-
+
IOUtils.writeLines(list, "*", out, (String) null);
-
+
out.off();
out.flush();
-
+
final String expected = "hello*world**this is**some text*";
final String actual = baout.toString();
assertEquals(expected, actual);
@@ -670,17 +670,17 @@ public class IOUtilsWriteTestCase extend
final Object[] data = new Object[] {
"hello", new StringBuffer("world"), "", "this is", null, "some text"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.writeLines(list, "*", writer);
-
+
out.off();
writer.flush();
-
+
final String expected = "hello*world**this is**some text*";
final String actual = baout.toString();
assertEquals(expected, actual);
@@ -691,27 +691,27 @@ public class IOUtilsWriteTestCase extend
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.writeLines((List<?>) null, "*", writer);
out.off();
writer.flush();
-
+
assertEquals("Sizes differ", 0, baout.size());
}
public void testWriteLines_Writer_nullSeparator() throws Exception {
final Object[] data = new Object[] {"hello", "world"};
final List<Object> list = Arrays.asList(data);
-
+
final ByteArrayOutputStream baout = new ByteArrayOutputStream();
@SuppressWarnings("resource") // deliberately not closed
final YellOnFlushAndCloseOutputStream out = new YellOnFlushAndCloseOutputStream(baout, true, true);
final Writer writer = new OutputStreamWriter(baout, "US-ASCII");
-
+
IOUtils.writeLines(list, (String) null, writer);
out.off();
writer.flush();
-
+
final String expected = "hello" + IOUtils.LINE_SEPARATOR + "world" + IOUtils.LINE_SEPARATOR;
final String actual = baout.toString();
assertEquals(expected, actual);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/LineIteratorTestCase.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 @@ import org.junit.Test;
/**
* This is used to test LineIterator for correctness.
- *
+ *
* @version $Id$
*/
public class LineIteratorTestCase extends FileBasedTestCase {
@@ -76,7 +76,7 @@ public class LineIteratorTestCase extend
/**
* Creates String data lines.
- *
+ *
* @param lineCount
* @return a new lines list.
*/
@@ -197,7 +197,7 @@ public class LineIteratorTestCase extend
/**
* Test a file with an Invalid encoding.
*/
- @Test
+ @Test
public void testInvalidEncoding() throws Exception {
final String encoding = "XXXXXXXX";
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/SelectorAdapter.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.
@@ -24,7 +24,7 @@ import java.util.Set;
/**
* Extends {@link Selector} with no-ops for testing.
- *
+ *
* @version $Id$
*/
public class SelectorAdapter extends Selector {
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.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.
@@ -20,26 +20,26 @@ import java.util.ArrayList;
import java.util.List;
public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase {
-
+
private static final String DEFAULT_WORKING_PATH = "./AndFileFilterTestCase/";
private static final String WORKING_PATH_NAME_PROPERTY_KEY = AndFileFilterTestCase.class.getName() + ".workingDirectory";
-
+
private List<List<IOFileFilter>> testFilters;
private List<boolean[]> testTrueResults;
private List<boolean[]> testFalseResults;
private List<Boolean> testFileResults;
private List<Boolean> testFilenameResults;
-
+
public AndFileFilterTestCase(final String name) {
super(name);
}
-
+
@Override
public void setUp() throws Exception {
super.setUp();
this.setUpTestFilters();
}
-
+
@Override
protected IOFileFilter buildFilterUsingAdd(final List<IOFileFilter> filters) {
final AndFileFilter filter = new AndFileFilter();
@@ -48,52 +48,52 @@ public class AndFileFilterTestCase exten
}
return filter;
}
-
+
@Override
protected IOFileFilter buildFilterUsingConstructor(final List<IOFileFilter> filters) {
return new AndFileFilter(filters);
}
-
+
@Override
protected ConditionalFileFilter getConditionalFileFilter() {
return new AndFileFilter();
}
-
+
@Override
protected String getDefaultWorkingPath() {
return DEFAULT_WORKING_PATH;
}
-
+
@Override
protected List<boolean[]> getFalseResults() {
return this.testFalseResults;
}
-
+
@Override
protected List<Boolean> getFileResults() {
return this.testFileResults;
}
-
+
@Override
protected List<Boolean> getFilenameResults() {
return this.testFilenameResults;
}
-
+
@Override
protected List<List<IOFileFilter>> getTestFilters() {
return this.testFilters;
}
-
+
@Override
protected List<boolean[]> getTrueResults() {
return this.testTrueResults;
}
-
+
@Override
protected String getWorkingPathNamePropertyKey() {
return WORKING_PATH_NAME_PROPERTY_KEY;
}
-
+
private void setUpTestFilters() {
// filters
//tests
@@ -111,7 +111,7 @@ public class AndFileFilterTestCase exten
testFileResults.add(0, null);
testFilenameResults.add(0, null);
}
-
+
// test 1 - Test conditional and with all filters returning true
{
// test 1 filters
@@ -152,7 +152,7 @@ public class AndFileFilterTestCase exten
testFileResults.add(2, Boolean.FALSE);
testFilenameResults.add(2, Boolean.FALSE);
}
-
+
// test 3 - Test conditional and with second filter returning false
{
// test 3 filters
@@ -174,7 +174,7 @@ public class AndFileFilterTestCase exten
testFileResults.add(3, Boolean.FALSE);
testFilenameResults.add(3, Boolean.FALSE);
}
-
+
// test 4 - Test conditional and with third filter returning false
{
// test 4 filters
@@ -189,7 +189,7 @@ public class AndFileFilterTestCase exten
final boolean[] trueResults = new boolean[] {true, true, false};
// test 4 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(4, filters);
testTrueResults.add(4, trueResults);
testFalseResults.add(4, falseResults);
@@ -211,14 +211,14 @@ public class AndFileFilterTestCase exten
final boolean[] trueResults = new boolean[] {false, false, false};
// test 5 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(5, filters);
testTrueResults.add(5, trueResults);
testFalseResults.add(5, falseResults);
testFileResults.add(5, Boolean.FALSE);
testFilenameResults.add(5, Boolean.FALSE);
}
-
+
// test 6 - Test conditional and with second and third filters returning false
{
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
@@ -232,14 +232,14 @@ public class AndFileFilterTestCase exten
final boolean[] trueResults = new boolean[] {true, false, false};
// test 6 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(6, filters);
testTrueResults.add(6, trueResults);
testFalseResults.add(6, falseResults);
testFileResults.add(6, Boolean.FALSE);
testFilenameResults.add(6, Boolean.FALSE);
}
-
+
// test 7 - Test conditional and with first and second filters returning false
{
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
@@ -253,14 +253,14 @@ public class AndFileFilterTestCase exten
final boolean[] trueResults = new boolean[] {false, false, false};
// test 7 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(7, filters);
testTrueResults.add(7, trueResults);
testFalseResults.add(7, falseResults);
testFileResults.add(7, Boolean.FALSE);
testFilenameResults.add(7, Boolean.FALSE);
}
-
+
// test 8 - Test conditional and with fourth filters returning false
{
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
@@ -272,7 +272,7 @@ public class AndFileFilterTestCase exten
final boolean[] trueResults = new boolean[] {true, true, true};
// test 8 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(8, filters);
testTrueResults.add(8, trueResults);
testFalseResults.add(8, falseResults);
@@ -290,7 +290,7 @@ public class AndFileFilterTestCase exten
final boolean[] trueResults = new boolean[] {false, false, false};
// test 9 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(9, filters);
testTrueResults.add(9, trueResults);
testFalseResults.add(9, falseResults);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.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.
@@ -22,20 +22,20 @@ import java.util.List;
public abstract class ConditionalFileFilterAbstractTestCase
extends IOFileFilterAbstractTestCase {
-
+
private static final String TEST_FILE_NAME_PREFIX = "TestFile";
private static final String TEST_FILE_TYPE = ".tst";
-
+
protected TesterTrueFileFilter[] trueFilters;
protected TesterFalseFileFilter[] falseFilters;
-
+
private File file;
private File workingPath;
-
+
public ConditionalFileFilterAbstractTestCase(final String name) {
super(name);
}
-
+
@Override
public void setUp() throws Exception {
this.workingPath = this.determineWorkingDirectoryPath(this.getWorkingPathNamePropertyKey(), this.getDefaultWorkingPath());
@@ -49,7 +49,7 @@ public abstract class ConditionalFileFil
this.falseFilters[2] = new TesterFalseFileFilter();
this.falseFilters[3] = new TesterFalseFileFilter();
}
-
+
public void testAdd() {
final List<TesterTrueFileFilter> filters = new ArrayList<TesterTrueFileFilter>();
final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
@@ -67,7 +67,7 @@ public abstract class ConditionalFileFil
}
assertEquals("file filters count", filters.size(), fileFilter.getFileFilters().size());
}
-
+
public void testRemove() {
final List<TesterTrueFileFilter> filters = new ArrayList<TesterTrueFileFilter>();
final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
@@ -88,14 +88,14 @@ public abstract class ConditionalFileFil
assertFileFiltering(1, (IOFileFilter) fileFilter, file, false);
assertFilenameFiltering(1, (IOFileFilter) fileFilter, file, false);
}
-
+
public void testFilterBuiltUsingConstructor() throws Exception {
final List<List<IOFileFilter>> testFilters = this.getTestFilters();
final List<boolean []> testTrueResults = this.getTrueResults();
final List<boolean []> testFalseResults = this.getFalseResults();
final List<Boolean> testFileResults = this.getFileResults();
final List<Boolean> testFilenameResults = this.getFilenameResults();
-
+
for(int i = 1; i < testFilters.size(); i++) {
final List<IOFileFilter> filters = testFilters.get(i);
final boolean[] trueResults = testTrueResults.get(i);
@@ -105,7 +105,7 @@ public abstract class ConditionalFileFil
// Test conditional AND filter created by passing filters to the constructor
final IOFileFilter filter = this.buildFilterUsingConstructor(filters);
-
+
// Test as a file filter
this.resetTrueFilters(this.trueFilters);
this.resetFalseFilters(this.falseFilters);
@@ -121,14 +121,14 @@ public abstract class ConditionalFileFil
this.assertFalseFiltersInvoked(i, falseFilters, falseResults);
}
}
-
+
public void testFilterBuiltUsingAdd() throws Exception {
final List<List<IOFileFilter>> testFilters = this.getTestFilters();
final List<boolean[]> testTrueResults = this.getTrueResults();
final List<boolean[]> testFalseResults = this.getFalseResults();
final List<Boolean> testFileResults = this.getFileResults();
final List<Boolean> testFilenameResults = this.getFilenameResults();
-
+
for(int i = 1; i < testFilters.size(); i++) {
final List<IOFileFilter> filters = testFilters.get(i);
final boolean[] trueResults = testTrueResults.get(i);
@@ -138,7 +138,7 @@ public abstract class ConditionalFileFil
// Test conditional AND filter created by passing filters to the constructor
final IOFileFilter filter = this.buildFilterUsingAdd(filters);
-
+
// Test as a file filter
this.resetTrueFilters(this.trueFilters);
this.resetFalseFilters(this.falseFilters);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.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.
@@ -43,7 +43,7 @@ public class FileFilterTestCase extends
* The subversion directory name.
*/
static final String SVN_DIR_NAME = ".svn";
-
+
private static final boolean WINDOWS = File.separatorChar == '\\';
public FileFilterTestCase(final String name) {
@@ -88,7 +88,7 @@ public class FileFilterTestCase extends
assertFiltering(filter, new File("fred.EST"), false); //case-sensitive
assertFiltering(filter, new File("fred.exe"), false);
- filter = FileFilterUtils.or(
+ filter = FileFilterUtils.or(
FileFilterUtils.suffixFileFilter( "tes" ),
FileFilterUtils.suffixFileFilter( "est" ) );
assertFiltering(filter, new File("fred"), false);
@@ -165,12 +165,12 @@ public class FileFilterTestCase extends
fail();
} catch (final IllegalArgumentException ex) {
}
-
+
// FileFilterUtils.suffixFileFilter(String, IOCase) tests
filter = FileFilterUtils.suffixFileFilter("est", IOCase.INSENSITIVE);
assertFiltering(filter, new File("test"), true);
assertFiltering(filter, new File("TEST"), true);
-
+
try {
FileFilterUtils.suffixFileFilter((String) null, IOCase.INSENSITIVE);
fail();
@@ -191,22 +191,22 @@ public class FileFilterTestCase extends
assertFiltering(filter, new File("imaginary/"), false);
assertFiltering(filter, new File("LICENSE.txt"), false);
-
+
assertSame(DirectoryFileFilter.DIRECTORY, DirectoryFileFilter.INSTANCE);
}
public void testFiles() throws Exception {
// XXX: This test presumes the current working dir is the base dir of the source checkout.
final IOFileFilter filter = FileFileFilter.FILE;
-
+
assertFiltering(filter, new File("src/"), false);
assertFiltering(filter, new File("src/java/"), false);
-
+
assertFiltering(filter, new File("pom.xml"), true);
-
+
assertFiltering(filter, new File("imaginary"), false);
assertFiltering(filter, new File("imaginary/"), false);
-
+
assertFiltering(filter, new File("LICENSE.txt"), true);
}
@@ -239,8 +239,8 @@ public class FileFilterTestCase extends
assertTrue( !listFilter.accept( testFile.getParentFile(), testFile.getName() ) );
assertTrue( listFilter.accept( fredFile.getParentFile(), fredFile.getName() ) );
-
-
+
+
try {
new PrefixFileFilter((String) null);
fail();
@@ -298,14 +298,14 @@ public class FileFilterTestCase extends
fail();
} catch (final IllegalArgumentException ex) {
}
-
+
// FileFilterUtils.prefixFileFilter(String, IOCase) tests
filter = FileFilterUtils.prefixFileFilter("bar", IOCase.INSENSITIVE);
assertFiltering(filter, new File("foo.test2"), false);
assertFiltering(filter, new File("bar.test2"), true);
assertFiltering(filter, new File("FOO.test2"), false); //case-sensitive
assertFiltering(filter, new File("BAR.test2"), true); //case-sensitive
-
+
try {
FileFilterUtils.prefixFileFilter((String) null, IOCase.INSENSITIVE);
fail();
@@ -318,25 +318,25 @@ public class FileFilterTestCase extends
assertFiltering(filter, new File("foo"), true);
assertFiltering(filter, new File("bar"), true);
assertFiltering(filter, new File("fred"), false);
-
+
filter = new NameFileFilter(new String[] { "foo", "bar" }, IOCase.SENSITIVE);
assertFiltering(filter, new File("foo"), true);
assertFiltering(filter, new File("bar"), true);
assertFiltering(filter, new File("FOO"), false);
assertFiltering(filter, new File("BAR"), false);
-
+
filter = new NameFileFilter(new String[] { "foo", "bar" }, IOCase.INSENSITIVE);
assertFiltering(filter, new File("foo"), true);
assertFiltering(filter, new File("bar"), true);
assertFiltering(filter, new File("FOO"), true);
assertFiltering(filter, new File("BAR"), true);
-
+
filter = new NameFileFilter(new String[] { "foo", "bar" }, IOCase.SYSTEM);
assertFiltering(filter, new File("foo"), true);
assertFiltering(filter, new File("bar"), true);
assertFiltering(filter, new File("FOO"), WINDOWS);
assertFiltering(filter, new File("BAR"), WINDOWS);
-
+
filter = new NameFileFilter(new String[] { "foo", "bar" }, (IOCase) null);
assertFiltering(filter, new File("foo"), true);
assertFiltering(filter, new File("bar"), true);
@@ -358,7 +358,7 @@ public class FileFilterTestCase extends
assertFiltering(filter, new File("barfoo"), false);
assertFiltering(filter, new File("foobar"), false);
assertFiltering(filter, new File("fred"), false);
-
+
// FileFilterUtils.nameFileFilter(String, IOCase) tests
filter = FileFilterUtils.nameFileFilter("foo", IOCase.INSENSITIVE);
assertFiltering(filter, new File("foo"), true);
@@ -375,7 +375,7 @@ public class FileFilterTestCase extends
fail( "constructing a NameFileFilter with a null String argument should fail.");
} catch( final IllegalArgumentException iae ) {
}
-
+
try {
FileFilterUtils.nameFileFilter(test, IOCase.INSENSITIVE);
fail( "constructing a NameFileFilter with a null String argument should fail.");
@@ -440,7 +440,7 @@ public class FileFilterTestCase extends
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
assertFiltering( new AndFileFilter( filters ), new File( "test" ), false );
assertFiltering( new AndFileFilter(), new File( "test" ), false );
-
+
try {
new AndFileFilter(falseFilter, null);
fail();
@@ -455,7 +455,7 @@ public class FileFilterTestCase extends
final AndFileFilter f = new AndFileFilter((List<IOFileFilter>) null);
assertTrue(f.getFileFilters().isEmpty());
-
+
assertNotNull(f.toString()); // TODO better tests
}
@@ -468,7 +468,7 @@ public class FileFilterTestCase extends
assertFiltering(new OrFileFilter(falseFilter, trueFilter), testFile, true);
assertFiltering(new OrFileFilter(falseFilter, falseFilter), testFile, false);
assertFiltering(new OrFileFilter(), testFile, false);
-
+
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
filters.add( trueFilter );
filters.add( falseFilter );
@@ -481,17 +481,17 @@ public class FileFilterTestCase extends
assertFiltering(orFilter, testFile, false);
orFilter.setFileFilters( filters );
assertFiltering(orFilter, testFile, true);
-
+
assertTrue( orFilter.accept( testFile.getParentFile(), testFile.getName() ) );
orFilter.removeFileFilter( trueFilter );
assertTrue( !orFilter.accept( testFile.getParentFile(), testFile.getName() ) );
-
+
try {
new OrFileFilter(falseFilter, null);
fail();
} catch (final IllegalArgumentException ex) {
}
-
+
final OrFileFilter f = new OrFileFilter((List<IOFileFilter>) null);
assertTrue(f.getFileFilters().isEmpty());
}
@@ -522,7 +522,7 @@ public class FileFilterTestCase extends
final File txtFile = new File( "test.txt" );
final File bmpFile = new File( "test.bmp" );
final File dir = new File( "src/java" );
-
+
assertFiltering(filter, new File("log.txt"), true);
// assertFiltering(filter, new File("log.txt.bak"), false);
@@ -580,62 +580,62 @@ public class FileFilterTestCase extends
IOFileFilter filter = new WildcardFileFilter("*.txt");
assertFiltering(filter, new File("log.txt"), true);
assertFiltering(filter, new File("log.TXT"), false);
-
+
filter = new WildcardFileFilter("*.txt", IOCase.SENSITIVE);
assertFiltering(filter, new File("log.txt"), true);
assertFiltering(filter, new File("log.TXT"), false);
-
+
filter = new WildcardFileFilter("*.txt", IOCase.INSENSITIVE);
assertFiltering(filter, new File("log.txt"), true);
assertFiltering(filter, new File("log.TXT"), true);
-
+
filter = new WildcardFileFilter("*.txt", IOCase.SYSTEM);
assertFiltering(filter, new File("log.txt"), true);
assertFiltering(filter, new File("log.TXT"), WINDOWS);
-
+
filter = new WildcardFileFilter("*.txt", (IOCase) null);
assertFiltering(filter, new File("log.txt"), true);
assertFiltering(filter, new File("log.TXT"), false);
-
+
filter = new WildcardFileFilter(new String[] {"*.java", "*.class"});
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.class"), true);
assertFiltering(filter, new File("Test.jsp"), false);
-
+
filter = new WildcardFileFilter(new String[] {"*.java", "*.class"}, IOCase.SENSITIVE);
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.JAVA"), false);
-
+
filter = new WildcardFileFilter(new String[] {"*.java", "*.class"}, IOCase.INSENSITIVE);
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.JAVA"), true);
-
+
filter = new WildcardFileFilter(new String[] {"*.java", "*.class"}, IOCase.SYSTEM);
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.JAVA"), WINDOWS);
-
+
filter = new WildcardFileFilter(new String[] {"*.java", "*.class"}, (IOCase) null);
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.JAVA"), false);
-
+
final List<String> patternList = Arrays.asList( new String[] { "*.txt", "*.xml", "*.gif" } );
final IOFileFilter listFilter = new WildcardFileFilter( patternList );
assertFiltering(listFilter, new File("Test.txt"), true);
assertFiltering(listFilter, new File("Test.xml"), true);
assertFiltering(listFilter, new File("Test.gif"), true);
assertFiltering(listFilter, new File("Test.bmp"), false);
-
+
final File txtFile = new File( "test.txt" );
final File bmpFile = new File( "test.bmp" );
final File dir = new File( "src/java" );
assertTrue( listFilter.accept( txtFile ) );
assertTrue( !listFilter.accept( bmpFile ) );
assertTrue( !listFilter.accept( dir ) );
-
+
assertTrue( listFilter.accept( txtFile.getParentFile(), txtFile.getName() ) );
assertTrue( !listFilter.accept( bmpFile.getParentFile(), bmpFile.getName() ) );
assertTrue( !listFilter.accept( dir.getParentFile(), dir.getName() ) );
-
+
try {
new WildcardFileFilter((String) null);
fail();
@@ -702,7 +702,7 @@ public class FileFilterTestCase extends
assertFiltering(filter1, file, true);
assertFiltering(filter2, file, false);
}
-
+
public void testMakeSVNAware() throws Exception {
final IOFileFilter filter1 = FileFilterUtils.makeSVNAware(null);
final IOFileFilter filter2 = FileFilterUtils.makeSVNAware(FileFilterUtils
@@ -738,7 +738,7 @@ public class FileFilterTestCase extends
createFile(oldFile, 0);
do {
- try {
+ try {
Thread.sleep(1000);
} catch(final InterruptedException ie) {
// ignore
@@ -750,7 +750,7 @@ public class FileFilterTestCase extends
final long now = date.getTime();
do {
- try {
+ try {
Thread.sleep(1000);
} catch(final InterruptedException ie) {
// ignore
@@ -862,7 +862,7 @@ public class FileFilterTestCase extends
public void testEmpty() throws Exception {
- // Empty Dir
+ // Empty Dir
final File emptyDir = new File(getTestDirectory(), "empty-dir");
emptyDir.mkdirs();
assertFiltering(EmptyFileFilter.EMPTY, emptyDir, true);
@@ -889,188 +889,188 @@ public class FileFilterTestCase extends
//-----------------------------------------------------------------------
public void testMakeDirectoryOnly() throws Exception {
assertSame(DirectoryFileFilter.DIRECTORY, FileFilterUtils.makeDirectoryOnly(null));
-
+
final IOFileFilter filter = FileFilterUtils.makeDirectoryOnly(
FileFilterUtils.nameFileFilter("B"));
-
+
final File fileA = new File(getTestDirectory(), "A");
final File fileB = new File(getTestDirectory(), "B");
-
+
fileA.mkdirs();
fileB.mkdirs();
-
+
assertFiltering(filter, fileA, false);
assertFiltering(filter, fileB, true);
-
+
FileUtils.deleteDirectory(fileA);
FileUtils.deleteDirectory(fileB);
-
+
createFile(fileA, 32);
createFile(fileB, 32);
-
+
assertFiltering(filter, fileA, false);
assertFiltering(filter, fileB, false);
-
+
fileA.delete();
fileB.delete();
}
-
+
//-----------------------------------------------------------------------
public void testMakeFileOnly() throws Exception {
assertSame(FileFileFilter.FILE, FileFilterUtils.makeFileOnly(null));
-
+
final IOFileFilter filter = FileFilterUtils.makeFileOnly(
FileFilterUtils.nameFileFilter("B"));
-
+
final File fileA = new File(getTestDirectory(), "A");
final File fileB = new File(getTestDirectory(), "B");
-
+
fileA.mkdirs();
fileB.mkdirs();
-
+
assertFiltering(filter, fileA, false);
assertFiltering(filter, fileB, false);
-
+
FileUtils.deleteDirectory(fileA);
FileUtils.deleteDirectory(fileB);
-
+
createFile(fileA, 32);
createFile(fileB, 32);
-
+
assertFiltering(filter, fileA, false);
assertFiltering(filter, fileB, true);
-
+
fileA.delete();
fileB.delete();
}
-
+
//-----------------------------------------------------------------------
-
+
public void testMagicNumberFileFilterBytes() throws Exception {
- final byte[] classFileMagicNumber =
+ final byte[] classFileMagicNumber =
new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" +
"<element>text</element>";
-
+
final File classFileA = new File(getTestDirectory(), "A.class");
final File xmlFileB = new File(getTestDirectory(), "B.xml");
final File emptyFile = new File(getTestDirectory(), "C.xml");
final File dir = new File(getTestDirectory(), "D");
dir.mkdirs();
-
+
final OutputStream classFileAStream = FileUtils.openOutputStream(classFileA);
IOUtils.write(classFileMagicNumber, classFileAStream);
generateTestData(classFileAStream, 32);
classFileAStream.close();
-
+
FileUtils.write(xmlFileB, xmlFileContent, Charsets.UTF_8);
FileUtils.touch(emptyFile);
-
+
IOFileFilter filter = new MagicNumberFileFilter(classFileMagicNumber);
-
+
assertFiltering(filter, classFileA, true);
assertFiltering(filter, xmlFileB, false);
assertFiltering(filter, emptyFile, false);
assertFiltering(filter, dir, false);
-
-
+
+
filter = FileFilterUtils.magicNumberFileFilter(classFileMagicNumber);
-
+
assertFiltering(filter, classFileA, true);
assertFiltering(filter, xmlFileB, false);
assertFiltering(filter, emptyFile, false);
assertFiltering(filter, dir, false);
}
-
+
public void testMagicNumberFileFilterBytesOffset() throws Exception {
final byte[] tarMagicNumber = new byte[] {0x75, 0x73, 0x74, 0x61, 0x72};
final long tarMagicNumberOffset = 257;
-
+
final File tarFileA = new File(getTestDirectory(), "A.tar");
final File randomFileB = new File(getTestDirectory(), "B.txt");
final File dir = new File(getTestDirectory(), "D");
dir.mkdirs();
-
+
final OutputStream tarFileAStream = FileUtils.openOutputStream(tarFileA);
generateTestData(tarFileAStream, tarMagicNumberOffset);
IOUtils.write(tarMagicNumber, tarFileAStream);
tarFileAStream.close();
-
+
createFile(randomFileB, 2 * tarMagicNumberOffset);
-
- IOFileFilter filter =
+
+ IOFileFilter filter =
new MagicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
-
+
assertFiltering(filter, tarFileA, true);
assertFiltering(filter, randomFileB, false);
assertFiltering(filter, dir, false);
-
- filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber,
+
+ filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber,
tarMagicNumberOffset);
-
+
assertFiltering(filter, tarFileA, true);
assertFiltering(filter, randomFileB, false);
assertFiltering(filter, dir, false);
}
-
+
public void testMagicNumberFileFilterString() throws Exception {
- final byte[] classFileMagicNumber =
+ final byte[] classFileMagicNumber =
new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE};
final String xmlFileContent = "<?xml version=\"1.0\" encoding=\"UTF-8\">\n" +
"<element>text</element>";
final String xmlMagicNumber = "<?xml version=\"1.0\"";
-
+
final File classFileA = new File(getTestDirectory(), "A.class");
final File xmlFileB = new File(getTestDirectory(), "B.xml");
final File dir = new File(getTestDirectory(), "D");
dir.mkdirs();
-
+
final OutputStream classFileAStream = FileUtils.openOutputStream(classFileA);
IOUtils.write(classFileMagicNumber, classFileAStream);
generateTestData(classFileAStream, 32);
classFileAStream.close();
-
+
FileUtils.write(xmlFileB, xmlFileContent, Charsets.UTF_8);
-
+
IOFileFilter filter = new MagicNumberFileFilter(xmlMagicNumber);
-
+
assertFiltering(filter, classFileA, false);
assertFiltering(filter, xmlFileB, true);
assertFiltering(filter, dir, false);
-
+
filter = FileFilterUtils.magicNumberFileFilter(xmlMagicNumber);
-
+
assertFiltering(filter, classFileA, false);
assertFiltering(filter, xmlFileB, true);
assertFiltering(filter, dir, false);
}
-
+
public void testMagicNumberFileFilterStringOffset() throws Exception {
final String tarMagicNumber = "ustar";
final long tarMagicNumberOffset = 257;
-
+
final File tarFileA = new File(getTestDirectory(), "A.tar");
final File randomFileB = new File(getTestDirectory(), "B.txt");
final File dir = new File(getTestDirectory(), "D");
dir.mkdirs();
-
+
final OutputStream tarFileAStream = FileUtils.openOutputStream(tarFileA);
generateTestData(tarFileAStream, tarMagicNumberOffset);
IOUtils.write(tarMagicNumber, tarFileAStream, Charsets.UTF_8);
tarFileAStream.close();
createFile(randomFileB, 2 * tarMagicNumberOffset);
-
- IOFileFilter filter =
+
+ IOFileFilter filter =
new MagicNumberFileFilter(tarMagicNumber, tarMagicNumberOffset);
-
+
assertFiltering(filter, tarFileA, true);
assertFiltering(filter, randomFileB, false);
assertFiltering(filter, dir, false);
-
- filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber,
+
+ filter = FileFilterUtils.magicNumberFileFilter(tarMagicNumber,
tarMagicNumberOffset);
-
+
assertFiltering(filter, tarFileA, true);
assertFiltering(filter, randomFileB, false);
assertFiltering(filter, dir, false);
@@ -1157,7 +1157,7 @@ public class FileFilterTestCase extends
final File fileA = newFile("A");
final File fileB = newFile("B");
try {
- FileFilterUtils.filter(null, fileA, fileB);
+ FileFilterUtils.filter(null, fileA, fileB);
fail();
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for null filter
@@ -1165,13 +1165,13 @@ public class FileFilterTestCase extends
final IOFileFilter filter = FileFilterUtils.trueFileFilter();
try {
- FileFilterUtils.filter(filter, fileA, null);
+ FileFilterUtils.filter(filter, fileA, null);
fail();
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for list containing null
}
- final File[] filtered = FileFilterUtils.filter(filter, (File[])null);
+ final File[] filtered = FileFilterUtils.filter(filter, (File[])null);
assertEquals(0, filtered.length);
}
@@ -1215,7 +1215,7 @@ public class FileFilterTestCase extends
*/
public void testFilterListNullParameters() {
try {
- FileFilterUtils.filterList(null, Collections.<File>emptyList());
+ FileFilterUtils.filterList(null, Collections.<File>emptyList());
fail();
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for null filter
@@ -1223,16 +1223,16 @@ public class FileFilterTestCase extends
final IOFileFilter filter = FileFilterUtils.trueFileFilter();
try {
- FileFilterUtils.filterList(filter, Arrays.<File>asList((File) null));
+ FileFilterUtils.filterList(filter, Arrays.<File>asList((File) null));
fail();
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for list containing null
}
- final List<File> filteredList = FileFilterUtils.filterList(filter, (List<File>)null);
+ final List<File> filteredList = FileFilterUtils.filterList(filter, (List<File>)null);
assertEquals(0, filteredList.size());
}
-
+
/**
* Test method for {@link FileFilterUtils#filterSet(IOFileFilter, java.lang.Iterable)}
* that tests that the method properly filters files from the set.
@@ -1249,7 +1249,7 @@ public class FileFilterTestCase extends
assertTrue(filteredSet.contains(fileA));
assertFalse(filteredSet.contains(fileB));
}
-
+
/**
* Test method for {@link FileFilterUtils#filterSet(IOFileFilter, File...)}
* that tests that the method properly filters files from the set.
@@ -1273,7 +1273,7 @@ public class FileFilterTestCase extends
*/
public void testFilterSetNullParameters() {
try {
- FileFilterUtils.filterSet(null, Collections.<File>emptySet());
+ FileFilterUtils.filterSet(null, Collections.<File>emptySet());
fail();
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for null filter
@@ -1281,20 +1281,20 @@ public class FileFilterTestCase extends
final IOFileFilter filter = FileFilterUtils.trueFileFilter();
try {
- FileFilterUtils.filterSet(filter, new HashSet<File>(Arrays.<File>asList((File) null)));
+ FileFilterUtils.filterSet(filter, new HashSet<File>(Arrays.<File>asList((File) null)));
fail();
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for set containing null
}
- final Set<File> filteredSet = FileFilterUtils.filterSet(filter, (Set<File>)null);
+ final Set<File> filteredSet = FileFilterUtils.filterSet(filter, (Set<File>)null);
assertEquals(0, filteredSet.size());
}
public void testEnsureTestCoverage() {
assertNotNull(new FileFilterUtils()); // dummy for test coverage
}
-
+
public void testNullFilters() {
try {
FileFilterUtils.toList((IOFileFilter)null);
@@ -1309,7 +1309,7 @@ public class FileFilterTestCase extends
// expected
}
}
-
+
public void testDelegation() { // TODO improve these tests
assertNotNull(FileFilterUtils.asFileFilter((FileFilter)FalseFileFilter.INSTANCE));
assertNotNull(FileFilterUtils.asFileFilter((FilenameFilter)FalseFileFilter.INSTANCE).toString());
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.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.
@@ -21,7 +21,7 @@ import java.io.File;
import junit.framework.TestCase;
public abstract class IOFileFilterAbstractTestCase extends TestCase {
-
+
/**
* Constructs a new instance of
* <code>IOFileFilterAbstractTestCase</code>.
@@ -29,7 +29,7 @@ public abstract class IOFileFilterAbstra
public IOFileFilterAbstractTestCase(final String name) {
super(name);
}
-
+
public boolean assertFileFiltering(final int testNumber, final IOFileFilter filter, final File file, final boolean expected)
throws Exception {
assertEquals(
@@ -59,7 +59,7 @@ public abstract class IOFileFilterAbstra
assertEquals(
"test " + testNumber + " Filter(File, String) " + filter.getClass().getName() + " not " + expected + " for " + file,
expected, filter.accept(file.getParentFile(), file.getName()));
- }
+ }
else if (file == null) {
assertEquals(
"test " + testNumber + " Filter(File, String) " + filter.getClass().getName() + " not " + expected + " for null",
@@ -72,13 +72,13 @@ public abstract class IOFileFilterAbstra
assertEquals("test " + testNumber + " filter " + i + " invoked", invoked[i-1], filters[i].isInvoked());
}
}
-
+
public void assertFalseFiltersInvoked(final int testNumber, final TesterFalseFileFilter[] filters, final boolean[] invoked) {
for(int i = 1; i < filters.length; i++) {
assertEquals("test " + testNumber + " filter " + i + " invoked", invoked[i-1], filters[i].isInvoked());
}
}
-
+
public File determineWorkingDirectoryPath(final String key, final String defaultPath) {
// Look for a system property to specify the working directory
final String workingPathName = System.getProperty(key, defaultPath);
@@ -92,7 +92,7 @@ public abstract class IOFileFilterAbstra
}
}
}
-
+
public void resetTrueFilters(final TesterTrueFileFilter[] filters) {
for (final TesterTrueFileFilter filter : filters) {
if(filter != null) {
@@ -100,23 +100,23 @@ public abstract class IOFileFilterAbstra
}
}
}
-
+
class TesterTrueFileFilter extends TrueFileFilter {
private boolean invoked;
-
+
@Override
public boolean accept(final File file) {
setInvoked(true);
return super.accept(file);
}
-
+
@Override
public boolean accept(final File file, final String str) {
setInvoked(true);
return super.accept(file, str);
}
-
+
public boolean isInvoked() {
return this.invoked;
}
@@ -124,28 +124,28 @@ public abstract class IOFileFilterAbstra
public void setInvoked(final boolean invoked) {
this.invoked = invoked;
}
-
+
public void reset() {
setInvoked(false);
}
}
-
+
class TesterFalseFileFilter extends FalseFileFilter {
-
+
private boolean invoked;
-
+
@Override
public boolean accept(final File file) {
setInvoked(true);
return super.accept(file);
}
-
+
@Override
public boolean accept(final File file, final String str) {
setInvoked(true);
return super.accept(file, str);
}
-
+
public boolean isInvoked() {
return this.invoked;
}
@@ -153,7 +153,7 @@ public abstract class IOFileFilterAbstra
public void setInvoked(final boolean invoked) {
this.invoked = invoked;
}
-
+
public void reset() {
setInvoked(false);
}
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.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.
@@ -20,26 +20,26 @@ import java.util.ArrayList;
import java.util.List;
public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase {
-
+
private static final String DEFAULT_WORKING_PATH = "./OrFileFilterTestCase/";
private static final String WORKING_PATH_NAME_PROPERTY_KEY = OrFileFilterTestCase.class.getName() + ".workingDirectory";
-
+
private List<List<IOFileFilter>> testFilters;
private List<boolean[]> testTrueResults;
private List<boolean[]> testFalseResults;
private List<Boolean> testFileResults;
private List<Boolean> testFilenameResults;
-
+
public OrFileFilterTestCase(final String name) {
super(name);
}
-
+
@Override
public void setUp() throws Exception {
super.setUp();
this.setUpTestFilters();
}
-
+
@Override
protected IOFileFilter buildFilterUsingAdd(final List<IOFileFilter> filters) {
final OrFileFilter filter = new OrFileFilter();
@@ -48,52 +48,52 @@ public class OrFileFilterTestCase extend
}
return filter;
}
-
+
@Override
protected IOFileFilter buildFilterUsingConstructor(final List<IOFileFilter> filters) {
return new OrFileFilter(filters);
}
-
+
@Override
protected ConditionalFileFilter getConditionalFileFilter() {
return new OrFileFilter();
}
-
+
@Override
protected String getDefaultWorkingPath() {
return DEFAULT_WORKING_PATH;
}
-
+
@Override
protected List<boolean[]> getFalseResults() {
return this.testFalseResults;
}
-
+
@Override
protected List<Boolean> getFileResults() {
return this.testFileResults;
}
-
+
@Override
protected List<Boolean> getFilenameResults() {
return this.testFilenameResults;
}
-
+
@Override
protected List<List<IOFileFilter>> getTestFilters() {
return this.testFilters;
}
-
+
@Override
protected List<boolean[]> getTrueResults() {
return this.testTrueResults;
}
-
+
@Override
protected String getWorkingPathNamePropertyKey() {
return WORKING_PATH_NAME_PROPERTY_KEY;
}
-
+
private void setUpTestFilters() {
// filters
//tests
@@ -111,7 +111,7 @@ public class OrFileFilterTestCase extend
testFileResults.add(0, null);
testFilenameResults.add(0, null);
}
-
+
// test 1 - Test conditional or with all filters returning true
{
// test 1 filters
@@ -152,7 +152,7 @@ public class OrFileFilterTestCase extend
testFileResults.add(2, Boolean.TRUE);
testFilenameResults.add(2, Boolean.TRUE);
}
-
+
// test 3 - Test conditional or with second filter returning false
{
// test 3 filters
@@ -174,7 +174,7 @@ public class OrFileFilterTestCase extend
testFileResults.add(3, Boolean.TRUE);
testFilenameResults.add(3, Boolean.TRUE);
}
-
+
// test 4 - Test conditional or with third filter returning false
{
// test 4 filters
@@ -189,7 +189,7 @@ public class OrFileFilterTestCase extend
final boolean[] trueResults = new boolean[] {true, false, false};
// test 4 false results
final boolean[] falseResults = new boolean[] {false, false, false};
-
+
testFilters.add(4, filters);
testTrueResults.add(4, trueResults);
testFalseResults.add(4, falseResults);
@@ -211,14 +211,14 @@ public class OrFileFilterTestCase extend
final boolean[] trueResults = new boolean[] {true, false, false};
// test 5 false results
final boolean[] falseResults = new boolean[] {true, false, false};
-
+
testFilters.add(5, filters);
testTrueResults.add(5, trueResults);
testFalseResults.add(5, falseResults);
testFileResults.add(5, Boolean.TRUE);
testFilenameResults.add(5, Boolean.TRUE);
}
-
+
// test 6 - Test conditional or with second and third filters returning false
{
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
@@ -232,14 +232,14 @@ public class OrFileFilterTestCase extend
final boolean[] trueResults = new boolean[] {true, false, false};
// test 6 false results
final boolean[] falseResults = new boolean[] {false, false, false};
-
+
testFilters.add(6, filters);
testTrueResults.add(6, trueResults);
testFalseResults.add(6, falseResults);
testFileResults.add(6, Boolean.TRUE);
testFilenameResults.add(6, Boolean.TRUE);
}
-
+
// test 7 - Test conditional or with first and second filters returning false
{
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
@@ -253,14 +253,14 @@ public class OrFileFilterTestCase extend
final boolean[] trueResults = new boolean[] {true, false, false};
// test 7 false results
final boolean[] falseResults = new boolean[] {true, true, false};
-
+
testFilters.add(7, filters);
testTrueResults.add(7, trueResults);
testFalseResults.add(7, falseResults);
testFileResults.add(7, Boolean.TRUE);
testFilenameResults.add(7, Boolean.TRUE);
}
-
+
// test 8 - Test conditional or with fourth filter returning false
{
final List<IOFileFilter> filters = new ArrayList<IOFileFilter>();
@@ -272,7 +272,7 @@ public class OrFileFilterTestCase extend
final boolean[] trueResults = new boolean[] {true, false, false};
// test 8 false results
final boolean[] falseResults = new boolean[] {false, false, false};
-
+
testFilters.add(8, filters);
testTrueResults.add(8, trueResults);
testFalseResults.add(8, falseResults);
@@ -290,7 +290,7 @@ public class OrFileFilterTestCase extend
final boolean[] trueResults = new boolean[] {false, false, false};
// test 9 false results
final boolean[] falseResults = new boolean[] {true, true, true};
-
+
testFilters.add(9, filters);
testTrueResults.add(9, trueResults);
testFalseResults.add(9, falseResults);
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.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.
@@ -114,5 +114,5 @@ public class RegexFileFilterTestCase ext
// expected
}
}
-
+
}
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.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.
@@ -562,7 +562,7 @@ public class BOMInputStreamTest {
@Test
public void testReadWithMultipleBOM() throws Exception {
final byte[] data = new byte[] { 'A', 'B', 'C' };
- final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, true),
+ final BOMInputStream in = new BOMInputStream(createUtf8DataStream(data, true),
ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_8);
assertEquals('A', in.read());
assertEquals('B', in.read());
@@ -656,7 +656,7 @@ public class BOMInputStreamTest {
parseXml(new BOMInputStream(createUtf32BeDataStream(data, false)));
parseXml(createUtf32BeDataStream(data, false));
}
-
+
@Test
public void testReadXmlWithoutBOMUtf32Le() throws Exception {
Assume.assumeTrue(Charset.isSupported("UTF_32LE"));
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CharSequenceInputStreamTest.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.
@@ -91,7 +91,7 @@ public class CharSequenceInputStreamTest
@Test
public void testBufferedRead_AvailableCharset() throws IOException {
for (final String csName : Charset.availableCharsets().keySet()) {
- // prevent java.lang.UnsupportedOperationException at sun.nio.cs.ext.ISO2022_CN.newEncoder.
+ // prevent java.lang.UnsupportedOperationException at sun.nio.cs.ext.ISO2022_CN.newEncoder.
if (Charset.forName(csName).canEncode() && ! "COMPOUND_TEXT".equalsIgnoreCase(csName)) {
testBufferedRead(TEST_STRING, csName);
}
@@ -376,7 +376,7 @@ public class CharSequenceInputStreamTest
public void testSkip_UTF8() throws Exception {
testSkip("UTF-8");
}
-
+
private int checkAvail(InputStream is, int min) throws Exception {
int available = is.available();
assertTrue("avail should be >= " + min + ", but was " + available, available >= min);
@@ -416,7 +416,7 @@ public class CharSequenceInputStreamTest
public void testAvailable() throws Exception {
for (final String csName : Charset.availableCharsets().keySet()) {
// prevent java.lang.UnsupportedOperationException at sun.nio.cs.ext.ISO2022_CN.newEncoder.
- // also try and avoid the following Effor on Continuum
+ // also try and avoid the following Effor on Continuum
// java.lang.UnsupportedOperationException: null
// at java.nio.CharBuffer.array(CharBuffer.java:940)
// at sun.nio.cs.ext.COMPOUND_TEXT_Encoder.encodeLoop(COMPOUND_TEXT_Encoder.java:75)
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/ClassLoaderObjectInputStreamTest.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.
@@ -40,7 +40,7 @@ public class ClassLoaderObjectInputStrea
* we would probably need to create a transient Class Loader. -TO
*/
-
+
public void testExpected() throws Exception {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -50,7 +50,7 @@ public class ClassLoaderObjectInputStrea
oos.writeObject( input );
final InputStream bais = new ByteArrayInputStream(baos.toByteArray());
- final ClassLoaderObjectInputStream clois =
+ final ClassLoaderObjectInputStream clois =
new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais);
final Object result = clois.readObject();
@@ -67,7 +67,7 @@ public class ClassLoaderObjectInputStrea
oos.writeObject(input);
final InputStream bais = new ByteArrayInputStream(baos.toByteArray());
- final ClassLoaderObjectInputStream clois =
+ final ClassLoaderObjectInputStream clois =
new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais);
final Object result = clois.readObject();
@@ -85,7 +85,7 @@ public class ClassLoaderObjectInputStrea
oos.close();
final InputStream bais = new ByteArrayInputStream(baos.toByteArray());
- final ClassLoaderObjectInputStream clois =
+ final ClassLoaderObjectInputStream clois =
new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais);
final long result = clois.readLong();
@@ -141,7 +141,7 @@ public class ClassLoaderObjectInputStrea
oos.close();
final InputStream bais = new ByteArrayInputStream(baos.toByteArray());
- final ClassLoaderObjectInputStream clois =
+ final ClassLoaderObjectInputStream clois =
new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais);
final Object result = clois.readObject();
@@ -159,7 +159,7 @@ public class ClassLoaderObjectInputStrea
oos.close();
final InputStream bais = new ByteArrayInputStream(baos.toByteArray());
- final ClassLoaderObjectInputStream clois =
+ final ClassLoaderObjectInputStream clois =
new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais);
final Object result = clois.readObject();
@@ -174,12 +174,12 @@ public class ClassLoaderObjectInputStrea
oos.writeObject( Boolean.FALSE );
final InputStream bais = new ByteArrayInputStream(baos.toByteArray());
- final ClassLoaderObjectInputStream clois =
+ final ClassLoaderObjectInputStream clois =
new ClassLoaderObjectInputStream(getClass().getClassLoader(), bais);
final String[] interfaces = new String[] { Comparable.class.getName() };
final Class<?> result = clois.resolveProxyClass(interfaces);
assertTrue("Assignable", Comparable.class.isAssignableFrom(result));
clois.close();
}
-
+
}
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/CountingInputStreamTest.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.
@@ -42,8 +42,8 @@ public class CountingInputStreamTest ext
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final CountingInputStream cis = new CountingInputStream(bais);
- // have to declare this larger as we're going to read
- // off the end of the stream and input stream seems
+ // have to declare this larger as we're going to read
+ // off the end of the stream and input stream seems
// to do bounds checking
final byte[] result = new byte[21];
@@ -53,7 +53,7 @@ public class CountingInputStreamTest ext
assertEquals( found, cis.getCount() );
final int value = cis.read();
- found++;
+ found++;
result[5] = (byte)value;
assertEquals( found, cis.getCount() );
@@ -118,7 +118,7 @@ public class CountingInputStreamTest ext
assertEquals( found, count );
cis.close();
}
-
+
public void testZeroLength1() throws Exception {
final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
final CountingInputStream cis = new CountingInputStream(bais);
@@ -192,18 +192,18 @@ public class CountingInputStreamTest ext
assertEquals(2, cis.getCount());
cis.close();
}
-
+
public void testSkipping() throws IOException {
final String text = "Hello World!";
final byte[] bytes = text.getBytes();
final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
final CountingInputStream cis = new CountingInputStream(bais);
-
+
assertEquals(6,cis.skip(6));
assertEquals(6,cis.getCount());
final byte[] result = new byte[6];
cis.read(result);
-
+
assertEquals("World!",new String(result));
assertEquals(12,cis.getCount());
cis.close();
Modified: commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/NullInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/NullInputStreamTest.java?rev=1471765&r1=1471764&r2=1471765&view=diff
==============================================================================
--- commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/NullInputStreamTest.java (original)
+++ commons/proper/io/trunk/src/test/java/org/apache/commons/io/input/NullInputStreamTest.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.
@@ -110,7 +110,7 @@ public class NullInputStreamTest extends
// reset by closing
input.close();
-
+
// Read into array using offset & length
final int offset = 2;
final int lth = 4;
@@ -145,7 +145,7 @@ public class NullInputStreamTest extends
int position = 0;
final int readlimit = 10;
final InputStream input = new TestNullInputStream(100, true, false);
-
+
assertTrue("Mark Should be Supported", input.markSupported());
// No Mark
@@ -258,6 +258,6 @@ public class NullInputStreamTest extends
bytes[i] = (byte)(startPos + i);
}
}
-
+
}
}