Author: scolebourne
Date: Sat Aug 27 09:51:02 2005
New Revision: 240439
URL: http://svn.apache.org/viewcvs?rev=240439&view=rev
Log:
Fix FileSystemUtils and add tests
from Frank W. Zammetti
Added:
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
(with props)
Removed:
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsChecker.java
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java?rev=240439&r1=240438&r2=240439&view=diff
==============================================================================
---
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
(original)
+++
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
Sat Aug 27 09:51:02 2005
@@ -16,8 +16,9 @@
package org.apache.commons.io;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStreamReader;
+import java.io.IOException;
+import java.util.ArrayList;
import java.util.StringTokenizer;
/**
@@ -30,13 +31,21 @@
* @author Stephen Colebourne
* @version $Id$
*/
-public final class FileSystemUtils {
+public class FileSystemUtils {
+ /** Singleton instance, used mainly for testing. */
+ private static final FileSystemUtils INSTANCE = new FileSystemUtils();
+
+ /** Operating system state flag for error. */
private static final int INIT_PROBLEM = -1;
+ /** Operating system state flag for neither Unix nor Windows. */
private static final int OTHER = 0;
+ /** Operating system state flag for Windows. */
private static final int WINDOWS = 1;
+ /** Operating system state flag for Unix. */
private static final int UNIX = 2;
+ /** The operating system flag. */
private static final int OS;
static {
int os = OTHER;
@@ -65,7 +74,7 @@
} else {
os = OTHER;
}
-
+
} catch (Exception ex) {
os = INIT_PROBLEM;
}
@@ -76,9 +85,9 @@
* Instances should NOT be constructed in standard programming.
*/
public FileSystemUtils() {
+ super();
}
- //-----------------------------------------------------------------------
/**
* Returns the free space on a drive or volume in a cross-platform manner.
* Note that some OS's are NOT currently supported, including OS/390.
@@ -87,19 +96,39 @@
* FileSystemUtils.getFreeSpace("/volume"); // *nix
* </pre>
* The free space is calculated via the command line.
- * It uses 'dir /-c' on Windows and 'df' on Unix.
+ * It uses 'dir /-c' on Windows and 'df' on *nix.
*
- * @param path the path to get free space for
+ * @param path the path to get free space for, not null, not empty on Unix
* @return the amount of free drive space on the drive or volume
* @throws IllegalArgumentException if the path is invalid
* @throws IllegalStateException if an error occurred in initialisation
* @throws IOException if an error occurs when finding the free space
*/
public static long getFreeSpace(String path) throws IOException {
- if (path == null || path.length() == 0) {
+ return INSTANCE.getFreeSpaceOS(path, OS);
+ }
+
+ /**
+ * Returns the free space on a drive or volume in a cross-platform manner.
+ * Note that some OS's are NOT currently supported, including OS/390.
+ * <pre>
+ * FileSystemUtils.getFreeSpace("C:"); // Windows
+ * FileSystemUtils.getFreeSpace("/volume"); // *nix
+ * </pre>
+ * The free space is calculated via the command line.
+ * It uses 'dir /-c' on Windows and 'df' on *nix.
+ *
+ * @param path the path to get free space for, not null, not empty on Unix
+ * @return the amount of free drive space on the drive or volume
+ * @throws IllegalArgumentException if the path is invalid
+ * @throws IllegalStateException if an error occurred in initialisation
+ * @throws IOException if an error occurs when finding the free space
+ */
+ protected long getFreeSpaceOS(String path, int os) throws IOException {
+ if (path == null) {
throw new IllegalArgumentException("Path must not be empty");
}
- switch (OS) {
+ switch (os) {
case WINDOWS:
return getFreeSpaceWindows(path);
case UNIX:
@@ -107,7 +136,8 @@
case OTHER:
throw new IllegalStateException("Unsupported operating
system");
default:
- throw new IllegalStateException("Exception caught when
determining operating system");
+ throw new IllegalStateException(
+ "Exception caught when determining operating system");
}
}
@@ -118,104 +148,171 @@
* @return the amount of free drive space on the drive
* @throws IOException if an error occurs
*/
- private static long getFreeSpaceWindows(String path) throws IOException {
+ protected long getFreeSpaceWindows(String path) throws IOException {
+ path = FilenameUtils.normalize(path);
+ if (path.length() > 2 && path.charAt(1) == ':') {
+ path = path.substring(0, 2);
+ }
+
// build and run the 'dir' command
- String line = null;
- String[] cmdAttrbs = new String[3];
- cmdAttrbs[0] = "cmd.exe";
- cmdAttrbs[1] = "/C";
- cmdAttrbs[2] = "dir /-c " + path;
- Process proc = Runtime.getRuntime().exec(cmdAttrbs);
+ String[] cmdAttrbs = new String[] {"cmd.exe", "/C", "dir /c " + path};
- // read the output until we find the line with 'bytes free'
- long bytes = -1;
+ // read in the output of the command to an ArrayList
BufferedReader in = null;
+ String line = null;
+ ArrayList lines = new ArrayList();
try {
- in = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+ in = openProcessStream(cmdAttrbs);
line = in.readLine();
while (line != null) {
- line = line.toLowerCase();
- int bfl = line.indexOf("bytes free");
- if (bfl != -1) {
- // found "bytes free"
- // chop off everything AFTER the actual byte count
- line = line.substring(0, bfl);
- line = line.trim();
- // find the LAST space in the string, should be right
before the
- // byte count
- int lsl = line.lastIndexOf(' ');
- // now get rid of everything BEFORE that space, and line
will
- // then contain just the byte count
- line = line.substring(lsl + 1);
- bytes = Long.parseLong(line);
- }
+ line = line.toLowerCase().trim();
+ lines.add(line);
line = in.readLine();
}
} finally {
IOUtils.closeQuietly(in);
}
- if (bytes == -1) {
+ if (lines.size() == 0) {
+ // unknown problem, throw exception
throw new IOException(
- "Command line 'dir' did not find text 'bytes free' in
response for path '" +
- path + "'- check path is of the form 'C:'");
+ "Command line 'dir /c' did not return any info " +
+ "for command '" + cmdAttrbs[2] + "'");
+ }
+
+ // now iterate over the lines we just read and find the LAST
+ // non-empty line (the free space bytes should be in the last element
+ // of the ArrayList anyway, but this will ensure it works even if it's
+ // not, still assuming it is on the last non-blank line)
+ long bytes = -1;
+ int i = lines.size() - 1;
+ int bytesStart = 0;
+ int bytesEnd = 0;
+ outerLoop: while (i > 0) {
+ line = (String) lines.get(i);
+ if (line.length() > 0) {
+ // found it, so now read from the end of the line to find the
+ // last numeric character on the line, then continue until we
+ // find the first non-numeric character, and everything between
+ // that and the last numeric character inclusive is our free
+ // space bytes count
+ int j = line.length() - 1;
+ innerLoop1: while (j >= 0) {
+ char c = line.charAt(j);
+ if (Character.isDigit(c)) {
+ // found the last numeric character, this is the end of
+ // the free space bytes count
+ bytesEnd = j + 1;
+ break innerLoop1;
+ }
+ j--;
+ }
+ innerLoop2: while (j >= 0) {
+ char c = line.charAt(j);
+ if (!Character.isDigit(c) && c != ',' && c != '.') {
+ // found the next non-numeric character, this is the
+ // beginning of the free space bytes count
+ bytesStart = j + 1;
+ break innerLoop2;
+ }
+ j--;
+ }
+ break outerLoop;
+ }
+ }
+
+ // remove commas and dots in the bytes count
+ StringBuffer buf = new StringBuffer(line.substring(bytesStart,
bytesEnd));
+ for (int k = 0; k < buf.length(); k++) {
+ if (buf.charAt(k) == ',' || buf.charAt(k) == '.') {
+ buf.deleteCharAt(k--);
+ }
}
+ bytes = Long.parseLong(buf.toString());
return bytes;
}
/**
- * Find free space on the Nix platform using the 'df' command.
+ * Find free space on the *nix platform using the 'df' command.
*
* @param path the path to get free space for
* @return the amount of free drive space on the volume
* @throws IOException if an error occurs
*/
- private static long getFreeSpaceUnix(String path) throws IOException {
+ protected long getFreeSpaceUnix(String path) throws IOException {
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Path must not be empty");
+ }
+ path = FilenameUtils.normalize(path);
+
// build and run the 'dir' command
- String[] cmdAttrbs = new String[3];
- cmdAttrbs[0] = "cmd.exe";
- cmdAttrbs[1] = "/C";
- cmdAttrbs[2] = "df " + path;
- Process proc = Runtime.getRuntime().exec(cmdAttrbs);
+ String[] cmdAttribs = new String[] {"df", path};
// read the output from the command until we come to the second line
long bytes = -1;
BufferedReader in = null;
try {
- in = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
+ in = openProcessStream(cmdAttribs);
String line1 = in.readLine(); // header line (ignore it)
String line2 = in.readLine(); // the line we're interested in
+ String line3 = in.readLine(); // possibly interesting line
if (line2 == null) {
// unknown problem, throw exception
throw new IOException(
- "Command line 'df' did not return info as expected for
path '" +
- path + "'- response on first line was '" + line1 +
'"');
+ "Command line 'df' did not return info as expected " +
+ "for path '" + path +
+ "'- response on first line was '" + line1 + "'");
}
line2 = line2.trim();
// Now, we tokenize the string. The fourth element is what we want.
StringTokenizer tok = new StringTokenizer(line2, " ");
if (tok.countTokens() < 4) {
- throw new IOException(
- "Command line 'df' did not return data as expected for
path '" +
- path + "'- check path is valid");
+ // could be long Filesystem, thus data on third line
+ if (tok.countTokens() == 1 && line3 != null) {
+ line3 = line3.trim();
+ tok = new StringTokenizer(line3, " ");
+ } else {
+ throw new IOException(
+ "Command line 'df' did not return data as expected
" +
+ "for path '" + path + "'- check path is valid");
+ }
+ } else {
+ tok.nextToken(); // Ignore Filesystem
}
- tok.nextToken(); // Ignore Filesystem
tok.nextToken(); // Ignore 1K-blocks
tok.nextToken(); // Ignore Used
String freeSpace = tok.nextToken();
- bytes = Long.parseLong(freeSpace);
+ try {
+ bytes = Long.parseLong(freeSpace);
+ } catch (NumberFormatException ex) {
+ throw new IOException(
+ "Command line 'df' did not return numeric data as
expected " +
+ "for path '" + path + "'- check path is valid");
+ }
} finally {
IOUtils.closeQuietly(in);
}
- if (bytes == -1) {
+ if (bytes < 0) {
throw new IOException(
- "Command line 'df' did not find free space in response for
path '" +
- path + "'- check path is valid");
+ "Command line 'df' did not find free space in response " +
+ "for path '" + path + "'- check path is valid");
}
return bytes;
+ }
+
+ /**
+ * Opens the stream to be operating system.
+ *
+ * @param params the command parameters
+ * @return a reader
+ */
+ protected BufferedReader openProcessStream(String[] params) throws
IOException {
+ Process proc = Runtime.getRuntime().exec(params);
+ return new BufferedReader(
+ new InputStreamReader(proc.getInputStream()));
}
}
Added:
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java?rev=240439&view=auto
==============================================================================
---
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
(added)
+++
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
Sat Aug 27 09:51:02 2005
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.io;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.apache.commons.io.testtools.FileBasedTestCase;
+
+/**
+ * This is used to test FileSystemUtils.
+ *
+ * @author Stephen Colebourne
+ * @version $Id$
+ */
+public class FileSystemUtilsTestCase extends FileBasedTestCase {
+
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite() {
+ return new TestSuite(FileSystemUtilsTestCase.class);
+ }
+
+ public FileSystemUtilsTestCase(String name) throws IOException {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ }
+
+ protected void tearDown() throws Exception {
+ }
+
+ //-----------------------------------------------------------------------
+ public void testGetFreeSpace_String() throws Exception {
+ // test coverage, as we can't check value
+ assertEquals(true, FileSystemUtils.getFreeSpace("") > 0);
+ }
+
+ //-----------------------------------------------------------------------
+ public void testGetFreeSpaceOS_String_NullPath() throws Exception {
+ FileSystemUtils fsu = new FileSystemUtils();
+ try {
+ fsu.getFreeSpaceOS(null, 1);
+ fail();
+ } catch (IllegalArgumentException ex) {}
+ }
+
+ public void testGetFreeSpaceOS_String_InitError() throws Exception {
+ FileSystemUtils fsu = new FileSystemUtils();
+ try {
+ fsu.getFreeSpaceOS("", -1);
+ fail();
+ } catch (IllegalStateException ex) {}
+ }
+
+ public void testGetFreeSpaceOS_String_Other() throws Exception {
+ FileSystemUtils fsu = new FileSystemUtils();
+ try {
+ fsu.getFreeSpaceOS("", 0);
+ fail();
+ } catch (IllegalStateException ex) {}
+ }
+
+ public void testGetFreeSpaceOS_String_Windows() throws Exception {
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected long getFreeSpaceWindows(String path) throws IOException
{
+ return 12345L;
+ }
+ };
+ assertEquals(12345L, fsu.getFreeSpaceOS("", 1));
+ }
+
+ public void testGetFreeSpaceOS_String_Unix() throws Exception {
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected long getFreeSpaceUnix(String path) throws IOException {
+ return 12345L;
+ }
+ };
+ assertEquals(12345L, fsu.getFreeSpaceOS("", 2));
+ }
+
+ //-----------------------------------------------------------------------
+ public void testGetFreeSpaceWindows_String_EmptyPath() throws Exception {
+ String lines =
+ " Volume in drive C is HDD\n" +
+ " Volume Serial Number is XXXX-YYYY\n" +
+ "\n" +
+ " Directory of C:\\Documents and Settings\\Xxxx\n" +
+ "\n" +
+ "19/08/2005 22:43 <DIR> .\n" +
+ "19/08/2005 22:43 <DIR> ..\n" +
+ "11/08/2005 01:07 81 build.properties\n" +
+ "17/08/2005 21:44 <DIR> Desktop\n" +
+ " 7 File(s) 180,260 bytes\n" +
+ " 10 Dir(s) 41,411,551,232 bytes free";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ assertEquals("dir /c ", params[2]);
+ return new BufferedReader(reader);
+ }
+ };
+ assertEquals(41411551232L, fsu.getFreeSpaceWindows(""));
+ }
+
+ public void testGetFreeSpaceWindows_String_NormalResponse() throws
Exception {
+ String lines =
+ " Volume in drive C is HDD\n" +
+ " Volume Serial Number is XXXX-YYYY\n" +
+ "\n" +
+ " Directory of C:\\Documents and Settings\\Xxxx\n" +
+ "\n" +
+ "19/08/2005 22:43 <DIR> .\n" +
+ "19/08/2005 22:43 <DIR> ..\n" +
+ "11/08/2005 01:07 81 build.properties\n" +
+ "17/08/2005 21:44 <DIR> Desktop\n" +
+ " 7 File(s) 180,260 bytes\n" +
+ " 10 Dir(s) 41,411,551,232 bytes free";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ assertEquals("dir /c C:", params[2]);
+ return new BufferedReader(reader);
+ }
+ };
+ assertEquals(41411551232L, fsu.getFreeSpaceWindows("C:"));
+ }
+
+ public void testGetFreeSpaceWindows_String_StripDrive() throws Exception {
+ String lines =
+ " Volume in drive C is HDD\n" +
+ " Volume Serial Number is XXXX-YYYY\n" +
+ "\n" +
+ " Directory of C:\\Documents and Settings\\Xxxx\n" +
+ "\n" +
+ "19/08/2005 22:43 <DIR> .\n" +
+ "19/08/2005 22:43 <DIR> ..\n" +
+ "11/08/2005 01:07 81 build.properties\n" +
+ "17/08/2005 21:44 <DIR> Desktop\n" +
+ " 7 File(s) 180,260 bytes\n" +
+ " 10 Dir(s) 41,411,551,232 bytes free";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ assertEquals("dir /c C:", params[2]);
+ return new BufferedReader(reader);
+ }
+ };
+ assertEquals(41411551232L, fsu.getFreeSpaceWindows("C:\\somedir"));
+ }
+
+ public void testGetFreeSpaceWindows_String_EmptyResponse() throws
Exception {
+ String lines = "";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceWindows("C:");
+ fail();
+ } catch (IOException ex) {}
+ }
+
+ //-----------------------------------------------------------------------
+ public void testGetFreeSpaceUnix_String_EmptyPath() throws Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ "xxx:/home/users/s 14428928 12956424 1472504 90%
/home/users/s";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceUnix("");
+ fail();
+ } catch (IllegalArgumentException ex) {}
+ }
+
+ public void testGetFreeSpaceUnix_String_NormalResponse() throws Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ "xxx:/home/users/s 14428928 12956424 1472504 90%
/home/users/s";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ assertEquals(1472504L, fsu.getFreeSpaceUnix("/home/users/s"));
+ }
+
+ public void testGetFreeSpaceUnix_String_LongResponse() throws Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ "xxx-yyyyyyy-zzz:/home/users/s\n" +
+ " 14428928 12956424 1472504 90%
/home/users/s";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ assertEquals(1472504L, fsu.getFreeSpaceUnix("/home/users/s"));
+ }
+
+ public void testGetFreeSpaceUnix_String_EmptyResponse() throws Exception {
+ String lines = "";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceUnix("/home/users/s");
+ fail();
+ } catch (IOException ex) {}
+ }
+
+ public void testGetFreeSpaceUnix_String_InvalidResponse1() throws
Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ " 14428928 12956424 100";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceUnix("/home/users/s");
+ fail();
+ } catch (IOException ex) {}
+ }
+
+ public void testGetFreeSpaceUnix_String_InvalidResponse2() throws
Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ "xxx:/home/users/s 14428928 12956424 nnnnnnn 90%
/home/users/s";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceUnix("/home/users/s");
+ fail();
+ } catch (IOException ex) {}
+ }
+
+ public void testGetFreeSpaceUnix_String_InvalidResponse3() throws
Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ "xxx:/home/users/s 14428928 12956424 -1 90%
/home/users/s";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceUnix("/home/users/s");
+ fail();
+ } catch (IOException ex) {}
+ }
+
+ public void testGetFreeSpaceUnix_String_InvalidResponse4() throws
Exception {
+ String lines =
+ "Filesystem 1K-blocks Used Available Use% Mounted
on\n" +
+ "xxx-yyyyyyy-zzz:/home/users/s";
+ final StringReader reader = new StringReader(lines);
+ FileSystemUtils fsu = new FileSystemUtils() {
+ protected BufferedReader openProcessStream(String[] params) {
+ return new BufferedReader(reader);
+ }
+ };
+ try {
+ fsu.getFreeSpaceUnix("/home/users/s");
+ fail();
+ } catch (IOException ex) {}
+ }
+
+}
Propchange:
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
------------------------------------------------------------------------------
svn:keywords = "author date id revision"
Modified:
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java?rev=240439&r1=240438&r2=240439&view=diff
==============================================================================
---
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
(original)
+++
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java
Sat Aug 27 09:51:02 2005
@@ -13,15 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.commons.io;
-import org.apache.commons.io.filefilter.FileFilterTestCase;
-
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.apache.commons.io.filefilter.FileFilterTestCase;
+
/**
* A basic test suite that tests all the IO package.
*
@@ -42,6 +41,7 @@
suite.addTest(new TestSuite(EndianUtilsTest.class));
suite.addTest(new TestSuite(FilenameUtilsTestCase.class));
suite.addTest(new TestSuite(FilenameUtilsWildcardTestCase.class));
+ suite.addTest(new TestSuite(FileSystemUtilsTestCase.class));
suite.addTest(new TestSuite(FileUtilsFileNewerTestCase.class));
suite.addTest(new TestSuite(FileUtilsListFilesTestCase.class));
suite.addTest(new TestSuite(FileUtilsTestCase.class));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
