[jboss-svn-commits] JBL Code SVN: r36781 - in labs/jbosstm/trunk/qa: tests/src/org/jboss/jbossts/qa/junit and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2011-03-04 09:22:16 -0500 (Fri, 04 Mar 2011)
New Revision: 36781

Modified:
   labs/jbosstm/trunk/qa/TaskImpl.properties
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
Log:
Modify qa test harness and tests to support optional in-process recovery model. JBTM-825


Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties	2011-03-04 11:01:38 UTC (rev 36780)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties	2011-03-04 14:22:16 UTC (rev 36781)
@@ -18,7 +18,7 @@
 COMMAND_LINE_0=/qa/tools/opt/jdk1.6.0_11/bin/java
 # use this form to inherit the java version used by ant:
 #COMMAND_LINE_0=${java.home}${file.separator}bin${file.separator}java
-#COMMAND_LINE_0=/usr/local/jdk1.6.0_21/bin/java
+#COMMAND_LINE_0=/usr/local/jdk1.6.0_24/bin/java
 #
 COMMAND_LINE_1=-classpath
 #
@@ -40,7 +40,9 @@
   ${path.separator}tests${file.separator}build${file.separator}jbossts-jts-qa.jar\
   ${path.separator}..${file.separator}ArjunaJTS${file.separator}jts${file.separator}build${file.separator}lib${file.separator}jts_tests.jar\
   ${path.separator}dbdrivers${file.separator}selected_dbdriver${file.separator}*\
-  ${path.separator}..${file.separator}build${file.separator}extlib${file.separator}emma.jar
+  ${path.separator}..${file.separator}build${file.separator}extlib${file.separator}emma.jar\
+  ${path.separator}..${file.separator}build${file.separator}extlib${file.separator}netty.jar
+
 #
 # properties used by the tests or test framework:
 #

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java	2011-03-04 11:01:38 UTC (rev 36780)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/ExecutionWrapper.java	2011-03-04 14:22:16 UTC (rev 36781)
@@ -24,9 +24,11 @@
 import com.arjuna.ats.arjuna.common.recoveryPropertyManager;
 import com.arjuna.ats.arjuna.objectstore.StoreManager;
 import com.arjuna.ats.arjuna.recovery.RecoveryManager;
+import com.arjuna.ats.internal.arjuna.objectstore.hornetq.HornetqJournalEnvironmentBean;
 import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.jts.common.jtsPropertyManager;
 import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
+import org.jboss.jbossts.qa.Utils.EmptyObjectStore;
 import org.jboss.jbossts.qa.Utils.OAInterface;
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 
@@ -62,6 +64,24 @@
             System.out.println("Ready");
             Thread.sleep(Long.MAX_VALUE);
         }
+        else if(className.equals("org.jboss.jbossts.qa.Utils.EmptyObjectStore"))
+        {
+            String objectStoreBaseDirBaseName = System.getProperty("ObjectStoreBaseDir");
+            // strip off the trailing '/emptyObjectStore' to get the test rather than task dir
+            objectStoreBaseDirBaseName = objectStoreBaseDirBaseName.substring(0, objectStoreBaseDirBaseName.lastIndexOf("/"));
+
+            
+            File directory = new File(objectStoreBaseDirBaseName);
+            
+            for(File candidateFile : directory.listFiles()) {
+                if(candidateFile.isDirectory()) {
+                    System.err.println("emptying "+candidateFile.getCanonicalPath());
+                    EmptyObjectStore.removeContents(candidateFile);
+                }
+            }
+            
+            System.out.println("Passed");
+        }
         else
         {
             int portOffset = Integer.valueOf(System.getProperty("portOffsetId"))*20;
@@ -82,7 +102,18 @@
             File hornetqStoreDir = new File(directory, "HornetQStore");
             //additionalCommandLineElements.add("-DHornetqJournalEnvironmentBean.storeDir="+hornetqStoreDir);
 
+            BeanPopulator.getDefaultInstance(HornetqJournalEnvironmentBean.class)
+                .setStoreDir(hornetqStoreDir.getCanonicalPath());
+            BeanPopulator.getDefaultInstance(ObjectStoreEnvironmentBean.class)
+                    .setObjectStoreType("com.arjuna.ats.internal.arjuna.objectstore.hornetq.HornetqObjectStoreAdaptor");
+/*
 
+    [junit] Running org.jboss.jbossts.qa.junit.testgroup.TestGroup_txcore_recovery
+    [junit] Tests run: 36, Failures: 24, Errors: 0, Time elapsed: 971.637 sec
+    [junit] Test org.jboss.jbossts.qa.junit.testgroup.TestGroup_txcore_recovery FAILED
+ */
+
+
             File ostoreDir = new File(directory, "ObjectStore");
             BeanPopulator.getDefaultInstance(ObjectStoreEnvironmentBean.class)
                     .setObjectStoreDir(ostoreDir.getCanonicalPath());

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2011-03-04 11:01:38 UTC (rev 36780)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/TestGroupBase.java	2011-03-04 14:22:16 UTC (rev 36781)
@@ -77,6 +77,9 @@
         servers.clear();
         objectStoreNamesToTaskIds.clear();
 
+        Task emptyObjectStore = createTask("emptyObjectStore", org.jboss.jbossts.qa.Utils.EmptyObjectStore.class, Task.TaskType.EXPECT_PASS_FAIL, 480);
+        emptyObjectStore.perform();
+
         try {
             Thread.sleep(3000);
         } catch(InterruptedException e) {}