JBTM-715

More unit tests. Coverage at 91% class for JTS.

ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/recovery/JacORBGenericRecoveryCreatorUnitTest.java

@@ -39,45 +39,33 @@
 import org.omg.CosTransactions.RecoveryCoordinator;
 import org.omg.CosTransactions.Control;
 
-import com.arjuna.ats.internal.jts.ORBManager;
 import com.arjuna.ats.internal.jts.orbspecific.coordinator.ArjunaTransactionImple;
 import com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit;
 import com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRecoveryInit;
 import com.arjuna.ats.internal.jts.recovery.RecoveryCreator;
 import com.arjuna.ats.internal.jts.recovery.recoverycoordinators.GenericRecoveryCreator;
-import com.arjuna.orbportability.OA;
-import com.arjuna.orbportability.ORB;
-import com.arjuna.orbportability.RootOA;
 import com.hp.mwtests.ts.jts.orbspecific.resources.DemoResource;
 import com.hp.mwtests.ts.jts.resources.TestBase;
 
 public class JacORBGenericRecoveryCreatorUnitTest extends TestBase
 {    
-    public void beforeSetupClass() {
+    public void beforeSetupClass()
+    {
         // persistent POAs can't be anonymous, need a name:
         System.setProperty("jacorb.implname", "arjuna");
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws Exception
+    {
         System.clearProperty("jacorb.implname");
+
+        super.tearDown();
     }
 
     @Test
     public void testFail () throws Exception
-    {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
-
+    {       
         JacOrbRCServiceInit init = new JacOrbRCServiceInit();
         JacOrbRecoveryInit rinit = new JacOrbRecoveryInit();
 
@@ -101,18 +89,6 @@ public void testFail () throws Exception
     @Test
     public void testSuccess () throws Exception
     {
-        ORB myORB = null;
-        RootOA myOA = null;
-
-        myORB = ORB.getInstance("test");
-        myOA = OA.getRootOA(myORB);
-
-        myORB.initORB(new String[] {}, null);
-        myOA.initOA();
-
-        ORBManager.setORB(myORB);
-        ORBManager.setPOA(myOA);
-
         JacOrbRCServiceInit init = new JacOrbRCServiceInit();
         JacOrbRecoveryInit rinit = new JacOrbRecoveryInit();
 

ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/recovery/RecoveredTransactionReplayerUnitTest.java

@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors 
+ * as indicated by the @author tags. 
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors. 
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * MA  02110-1301, USA.
+ * 
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2004,
+ *
+ * Arjuna Technologies Ltd,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.  
+ *
+ * $Id: xidcheck.java 2342 2006-03-30 13:06:17Z  $
+ */
+
+package com.hp.mwtests.ts.jts.recovery;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.arjuna.ats.arjuna.common.Uid;
+import com.arjuna.ats.internal.jts.recovery.transactions.RecoveredTransactionReplayer;
+import com.hp.mwtests.ts.jts.orbspecific.resources.DemoResource;
+import com.hp.mwtests.ts.jts.resources.TestBase;
+
+import org.omg.CosTransactions.Status;
+
+
+public class RecoveredTransactionReplayerUnitTest extends TestBase
+{
+    @Test
+    public void testCommitted () throws Exception
+    {
+        /*
+         * Deliberately choose a Uid that doesn't represent a state
+         * on disk.
+         * 
+         * Use un-threaded.
+         */
+
+        Uid dummyUid = new Uid();
+        String dummyState = "/StateManager/DummyState";
+        RecoveredTransactionReplayer replayer = new RecoveredTransactionReplayer(dummyUid, dummyState);
+        DemoResource res = new DemoResource();
+
+        assertTrue(RecoveredTransactionReplayer.isPresent(dummyUid) != null);
+
+        replayer.replayPhase2();
+
+        replayer.swapResource(dummyUid, res.getResource());
+
+        replayer.run();  
+
+        assertTrue(RecoveredTransactionReplayer.isPresent(dummyUid) == null);
+    }
+}

ArjunaJTS/jts/tests/classes/com/hp/mwtests/ts/jts/utils/UtilityTest.java

@@ -41,6 +41,7 @@
 import org.omg.CosTransactions.otid_t;
 
 import com.arjuna.ats.arjuna.common.Uid;
+import com.arjuna.ats.internal.jts.recovery.transactions.RecoveryStatus;
 import com.arjuna.ats.jts.exceptions.ExceptionCodes;
 import com.arjuna.ats.jts.utils.Utility;
 
@@ -82,4 +83,15 @@ public void testExceptions ()
             assertTrue(Utility.exceptionCode(i).length() > 1);
         }
     }
+
+    @Test
+    public void testReplayStatus ()
+    {
+        RecoveryStatus s = new RecoveryStatus();
+
+        for (int i = RecoveryStatus.NEW; i < RecoveryStatus.REPLAY_FAILED + 1; i++)
+        {
+            assertTrue(RecoveryStatus.stringForm(i) != null);
+        }
+    }
 }