Author: cutting
Date: Thu Oct 20 10:10:56 2005
New Revision: 326947

URL: http://svn.apache.org/viewcvs?rev=326947&view=rev
Log:
Fix to properly and simply remove old data.

Modified:
    
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestSequenceFileInputFormat.java
    
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestTextInputFormat.java

Modified: 
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestSequenceFileInputFormat.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestSequenceFileInputFormat.java?rev=326947&r1=326946&r2=326947&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestSequenceFileInputFormat.java
 (original)
+++ 
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestSequenceFileInputFormat.java
 Thu Oct 20 10:10:56 2005
@@ -44,13 +44,7 @@
     //LOG.info("seed = "+seed);
     Random random = new Random(seed);
 
-    fs.mkdirs(dir);
-    File[] files = fs.listFiles(dir);
-    if (files != null) {
-      for (int i = 0; i < files.length; i++) {
-        fs.delete(files[i]);
-      }
-    }
+    fs.delete(dir);
 
     job.setInputDir(dir);
 
@@ -61,7 +55,6 @@
       //LOG.info("creating; entries = " + length);
 
       // create a file with length entries
-      fs.delete(file);
       SequenceFile.Writer writer =
         new SequenceFile.Writer(fs, file.toString(),
                                 IntWritable.class, BytesWritable.class);

Modified: 
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestTextInputFormat.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestTextInputFormat.java?rev=326947&r1=326946&r2=326947&view=diff
==============================================================================
--- 
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestTextInputFormat.java
 (original)
+++ 
lucene/nutch/branches/mapred/src/test/org/apache/nutch/mapred/TestTextInputFormat.java
 Thu Oct 20 10:10:56 2005
@@ -44,14 +44,7 @@
     //LOG.info("seed = "+seed);
     Random random = new Random(seed);
 
-    fs.mkdirs(dir);
-    File[] files = fs.listFiles(dir);
-    if (files != null) {
-      for (int i = 0; i < files.length; i++) {
-        fs.delete(files[i]);
-      }
-    }
-
+    fs.delete(dir);
     job.setInputDir(dir);
 
     // for a variety of lengths
@@ -61,7 +54,6 @@
       //LOG.info("creating; entries = " + length);
 
       // create a file with length entries
-      fs.delete(file);
       Writer writer = new OutputStreamWriter(fs.create(file));
       try {
         for (int i = 0; i < length; i++) {


Reply via email to