You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ba...@apache.org on 2002/10/26 08:24:15 UTC

cvs commit: jakarta-commons-sandbox/io/src/test/org/apache/commons/io FileUtilTestCase.java IOUtilTestCase.java

bayard      2002/10/25 23:24:15

  Modified:    io/src/test/org/apache/commons/io FileUtilTestCase.java
                        IOUtilTestCase.java
  Log:
  Code changed so it compiles. Tests don't pass, but its a step anyway.
  Problems are probably all caused by my slow-refactoring.
  
  Revision  Changes    Path
  1.3       +14 -14    jakarta-commons-sandbox/io/src/test/org/apache/commons/io/FileUtilTestCase.java
  
  Index: FileUtilTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/io/src/test/org/apache/commons/io/FileUtilTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FileUtilTestCase.java	9 Jul 2002 15:12:23 -0000	1.2
  +++ FileUtilTestCase.java	26 Oct 2002 06:24:15 -0000	1.3
  @@ -70,7 +70,7 @@
   import junit.framework.TestSuite;
   
   /**
  - * This is used to test FileUtil for correctness.
  + * This is used to test FileUtils for correctness.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    */
  @@ -137,7 +137,7 @@
           throws Exception
       {
           final File destination = new File( m_testDirectory, "copy1.txt" );
  -        FileUtil.copyFile( m_testFile1, destination );
  +        FileUtils.copyFile( m_testFile1, destination );
           assertTrue( "Check Exist", destination.exists() );
           assertTrue( "Check Full copy", destination.length() == FILE1_SIZE );
       }
  @@ -146,7 +146,7 @@
           throws Exception
       {
           final File destination = new File( m_testDirectory, "copy2.txt" );
  -        FileUtil.copyFile( m_testFile2, destination );
  +        FileUtils.copyFile( m_testFile2, destination );
           assertTrue( "Check Exist", destination.exists() );
           assertTrue( "Check Full copy", destination.length() == FILE2_SIZE );
       }
  @@ -157,7 +157,7 @@
           final File destination = new File( m_testDirectory, "copy1.txt" );
           destination.createNewFile();
           assertTrue( "Copy1.txt doesn't exist to delete", destination.exists() );
  -        FileUtil.forceDelete( destination );
  +        FileUtils.forceDelete( destination );
           assertTrue( "Check No Exist", !destination.exists() );
       }
   
  @@ -167,7 +167,7 @@
           final File destination = new File( m_testDirectory, "copy2.txt" );
           destination.createNewFile();
           assertTrue( "Copy2.txt doesn't exist to delete", destination.exists() );
  -        FileUtil.forceDelete( destination );
  +        FileUtils.forceDelete( destination );
           assertTrue( "Check No Exist", !destination.exists() );
       }
   
  @@ -177,7 +177,7 @@
           final File directory = new File( m_testDirectory, "subdir" );
           if( !directory.exists() ) directory.mkdirs();
           final File destination = new File( directory, "file1-test.txt" );
  -        FileUtil.copyFileToDirectory( m_testFile1, directory );
  +        FileUtils.copyFileToDirectory( m_testFile1, directory );
           assertTrue( "Check Exist", destination.exists() );
           assertTrue( "Check Full copy", destination.length() == FILE1_SIZE );
       }
  @@ -188,7 +188,7 @@
           final File directory = new File( m_testDirectory, "subdir" );
           if( !directory.exists() ) directory.mkdirs();
           final File destination = new File( directory, "file2-test.txt" );
  -        FileUtil.copyFileToDirectory( m_testFile2, directory );
  +        FileUtils.copyFileToDirectory( m_testFile2, directory );
           assertTrue( "Check Exist", destination.exists() );
           assertTrue( "Check Full copy", destination.length() == FILE2_SIZE );
       }
  @@ -196,21 +196,21 @@
       public void testForceDeleteDir()
           throws Exception
       {
  -        FileUtil.forceDelete( m_testDirectory.getParentFile() );
  +        FileUtils.forceDelete( m_testDirectory.getParentFile() );
           assertTrue( "Check No Exist", !m_testDirectory.getParentFile().exists() );
       }
   
       public void testResolveFileDotDot()
           throws Exception
       {
  -        final File file = FileUtil.resolveFile( m_testDirectory, ".." );
  +        final File file = FileUtils.resolveFile( m_testDirectory, ".." );
           assertEquals( "Check .. operator", file, m_testDirectory.getParentFile() );
       }
   
       public void testResolveFileDot()
           throws Exception
       {
  -        final File file = FileUtil.resolveFile( m_testDirectory, "." );
  +        final File file = FileUtils.resolveFile( m_testDirectory, "." );
           assertEquals( "Check . operator", file, m_testDirectory );
       }
   
  @@ -236,7 +236,7 @@
           for( int i = 0; i < src.length; i++ )
           {
               assertEquals( "Check if '" + src[ i ] + "' normalized to '" + dest[ i ] + "'",
  -                          dest[ i ], FileUtil.normalize( src[ i ] ) );
  +                          dest[ i ], FileUtils.normalize( src[ i ] ) );
           }
       }
   }
  
  
  
  1.3       +4 -4      jakarta-commons-sandbox/io/src/test/org/apache/commons/io/IOUtilTestCase.java
  
  Index: IOUtilTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/io/src/test/org/apache/commons/io/IOUtilTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IOUtilTestCase.java	9 Jul 2002 15:12:23 -0000	1.2
  +++ IOUtilTestCase.java	26 Oct 2002 06:24:15 -0000	1.3
  @@ -131,7 +131,7 @@
       {
           try
           {
  -            FileUtil.deleteDirectory( "test" );
  +            FileUtils.deleteDirectory( "test" );
           }
           catch( IOException ioe )
           {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>