svn commit: r1294687 - in /oodt/trunk: CHANGES.txt workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java

[ma...@apache.org]

Author: mattmann
Date: Tue Feb 28 15:20:57 2012
New Revision: 1294687

URL: http://svn.apache.org/viewvc?rev=1294687&view=rev
Log:
- fix for OODT-397 XmlRpcWorkflowManager tests don't properly clean up LuceneCatalog remnants

Modified:
    oodt/trunk/CHANGES.txt
    oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java

Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1294687&r1=1294686&r2=1294687&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Tue Feb 28 15:20:57 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
 Release 0.4: Current Development
 --------------------------------------------
 
+* OODT-397 XmlRpcWorkflowManager tests don't properly clean up 
+  LuceneCatalog remnants (mattmann)
+
 * OODT-396 Add shutdown hook to the Workflow Manager server (mattmann)
 
 * OODT-394 Integrate CAS-Protocol with CAS-CLI (bfoster)

Modified: oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java?rev=1294687&r1=1294686&r2=1294687&view=diff
==============================================================================
--- oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java (original)
+++ oodt/trunk/workflow/src/test/org/apache/oodt/cas/workflow/system/TestXmlRpcWorkflowManager.java Tue Feb 28 15:20:57 2012
@@ -20,13 +20,17 @@ package org.apache.oodt.cas.workflow.sys
 //JDK imports
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.net.URL;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 //Junit imports
 import junit.framework.TestCase;
 
 //OODT imports
+import org.apache.commons.io.FileUtils;
 import org.apache.oodt.cas.metadata.Metadata;
 
 /**
@@ -47,6 +51,9 @@ public class TestXmlRpcWorkflowManager e
 
   private String luceneCatLoc;
 
+  private static final Logger LOG = Logger
+      .getLogger(TestXmlRpcWorkflowManager.class.getName());
+
   public void testGetWorkflowInstances() {
     Vector workflowInsts = null;
     try {
@@ -65,26 +72,6 @@ public class TestXmlRpcWorkflowManager e
   }
 
   protected void tearDown() throws Exception {
-    // FIXME: wmgr.shutdown(); // Define a method and shutdown the webserver.
-    // This is
-    // FIXME: not implemented in XmlRpcWorkflowManager.
-
-    // blow away lucene cat
-    deleteAllFiles(luceneCatLoc);
-
-  }
-
-  private void deleteAllFiles(String startDir) {
-    File startDirFile = new File(startDir);
-    File[] delFiles = startDirFile.listFiles();
-
-    if (delFiles != null && delFiles.length > 0) {
-      for (int i = 0; i < delFiles.length; i++) {
-        delFiles[i].delete();
-      }
-    }
-
-    startDirFile.delete();
 
   }
 
@@ -118,13 +105,27 @@ public class TestXmlRpcWorkflowManager e
     }
 
     try {
-      luceneCatLoc = File.createTempFile("blah", "txt").getParentFile().getCanonicalPath();
-      luceneCatLoc = !luceneCatLoc.endsWith("/") ? luceneCatLoc+"/":luceneCatLoc;
+      luceneCatLoc = File.createTempFile("blah", "txt").getParentFile()
+          .getCanonicalPath();
+      luceneCatLoc = !luceneCatLoc.endsWith("/") ? luceneCatLoc + "/"
+          : luceneCatLoc;
       luceneCatLoc += "repo";
+      LOG.log(Level.INFO, "Lucene instance repository: [" + luceneCatLoc + "]");
     } catch (Exception e) {
       fail(e.getMessage());
     }
 
+    if (new File(luceneCatLoc).exists()) {
+      // blow away lucene cat
+      LOG.log(Level.INFO, "Removing workflow instance repository: ["
+          + luceneCatLoc + "]");
+      try {
+        FileUtils.deleteDirectory(new File(luceneCatLoc));
+      } catch (IOException e) {
+        fail(e.getMessage());
+      }
+    }
+
     System
         .setProperty("workflow.engine.instanceRep.factory",
             "org.apache.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepositoryFactory");