[jboss-svn-commits] JBL Code SVN: r37854 - labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jan 19 06:35:02 EST 2012


Author: paul.robinson
Date: 2012-01-19 06:35:00 -0500 (Thu, 19 Jan 2012)
New Revision: 37854

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java
Log:
JBTM-1025 Ensure object store is empty before each XTS crash-recovery test

Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java	2012-01-19 11:12:06 UTC (rev 37853)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java	2012-01-19 11:35:00 UTC (rev 37854)
@@ -52,6 +52,32 @@
             file.delete();
         }
 
+        //Ensure ObjectStore is empty:
+        String jbossHome = System.getenv("JBOSS_HOME");
+        if (jbossHome == null)
+        {
+            Assert.fail("$JBOSS_HOME not set");
+        }
+        else
+        {
+            File objectStore = new File(jbossHome + File.separator + "standalone" + File.separator + "data" + File.separator + "tx-object-store");
+            System.out.println("Deleting: " + objectStore.getPath());
+
+            if (objectStore.exists())
+            {
+                boolean success = deleteDirectory(objectStore);
+                if (!success)
+                {
+                    System.err.println("Failed to remove tx-object-store");
+                    Assert.fail("Failed to remove tx-object-store: " + objectStore.getPath());
+                }
+                else
+                {
+                    System.out.println("remove tx-object-store: " + objectStore.getPath());
+                }
+            }
+
+        }
     }
 
     @After
@@ -104,4 +130,24 @@
         //controller.stop("jboss-as");
         controller.kill("jboss-as");
     }
+
+    private boolean deleteDirectory(File path)
+    {
+        if (path.exists())
+        {
+            File[] files = path.listFiles();
+            for (int i = 0; i < files.length; i++)
+            {
+                if (files[i].isDirectory())
+                {
+                    deleteDirectory(files[i]);
+                }
+                else
+                {
+                    files[i].delete();
+                }
+            }
+        }
+        return (path.delete());
+    }
 }



More information about the jboss-svn-commits mailing list