svn commit: r1728426 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java

[ka...@apache.org]

Author: kahatlen
Date: Thu Feb  4 09:06:28 2016
New Revision: 1728426

URL: http://svn.apache.org/viewvc?rev=1728426&view=rev
Log:
DERBY-6864: RawDBReaderTest fails on Windows

Use BaseTestCase.assertDirectoryDeleted() instead of File.delete()
to delete the db directory, so that we get more information if the
directory cannot be deleted.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java?rev=1728426&r1=1728425&r2=1728426&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/RawDBReaderTest.java Thu Feb  4 09:06:28 2016
@@ -147,13 +147,13 @@ public class RawDBReaderTest extends Gen
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        
+
         if ( _dbDir != null )
         {
             // delete the corrupt database so that later tests,
             // which require sql authorization, won't bomb because
             // they can't open the encrypted database
-            assertTrue( deleteFile( _dbDir ) );
+            assertDirectoryDeleted(_dbDir);
             _dbDir = null;
         }
     }
@@ -374,17 +374,4 @@ public class RawDBReaderTest extends Gen
         goodStatement( conn, "drop schema schema1 restrict" );
         goodStatement( conn, "drop schema schema2 restrict" );
     }
-    
-    private  boolean deleteFile( File file ) throws Exception
-    {
-        boolean retval = true;
-        
-        if ( file.isDirectory() )
-        {
-            for ( File child : file.listFiles() ) { retval = retval && deleteFile( child ); }
-        }
-
-        return retval && file.delete();
-    }
-
 }