[JBTM-1816] Clear out object store before running each unit test

jbosstm · Jul 5, 2013 · c5ade74 · c5ade74
1 parent 40703cf
commit c5ade74
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/ArjunaJTS/jts/pom.xml b/ArjunaJTS/jts/pom.xml
@@ -320,8 +320,6 @@
                   <skip>false</skip>
                   <systemProperties combine.children="append" />
                   <excludes>
-                    <!-- JavaIdlRecoveryUnitTest fails because of unset ID -->
-                    <exclude>**/JavaIdlRecoveryUnitTest.java</exclude>
                     <exclude>**/JacORBGenericRecoveryCreatorUnitTest.java</exclude>
                     <exclude>**/JacORBRecoveryUnitTest.java</exclude>
                     <exclude>**/GenericRecoveryCreatorUnitTest.java</exclude>

diff --git a/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestBase.java b/ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/resources/TestBase.java
@@ -31,6 +31,7 @@
 
 package com.hp.mwtests.ts.jts.resources;
 
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
 import org.junit.After;
 import org.junit.Before;
 
@@ -39,6 +40,8 @@
 import com.arjuna.orbportability.ORB;
 import com.arjuna.orbportability.RootOA;
 
+import java.io.File;
+
 public class TestBase
 {  
 	public void beforeSetupClass() {} 
@@ -47,7 +50,8 @@ public void beforeSetupClass() {}
     public void setUp () throws Exception
     {
     	beforeSetupClass();
-
+    	emptyObjectStore();
+
         myORB = ORB.getInstance("test");
         myOA = OA.getRootOA(myORB);
 
@@ -63,8 +67,47 @@ public void tearDown () throws Exception
     {
         myOA.destroy();
         myORB.shutdown();
+        emptyObjectStore();
     }
-
+
+    private void emptyObjectStore()
+    {
+        String objectStoreDirName = arjPropertyManager.getObjectStoreEnvironmentBean().getObjectStoreDir();
+
+        System.out.printf("Emptying %s\n", objectStoreDirName);
+
+        File objectStoreDir = new File(objectStoreDirName);
+
+        removeContents(objectStoreDir);
+    }
+
+    public void removeContents(File directory)
+    {
+        if ((directory != null) &&
+                directory.isDirectory() &&
+                (!directory.getName().equals("")) &&
+                (!directory.getName().equals("/")) &&
+                (!directory.getName().equals("\\")) &&
+                (!directory.getName().equals(".")) &&
+                (!directory.getName().equals("..")))
+        {
+            File[] contents = directory.listFiles();
+
+            for (int index = 0; index < contents.length; index++)
+            {
+                if (contents[index].isDirectory())
+                {
+                    removeContents(contents[index]);
+                    contents[index].delete();
+                }
+                else
+                {
+                    contents[index].delete();
+                }
+            }
+        }
+    }
+
     private ORB myORB = null;
     private RootOA myOA = null;
 }