[jboss-svn-commits] JBL Code SVN: r37148 - in labs/jbosstm/trunk/ArjunaJTA/examples: object_store/src/main/java/org/jboss/narayana/jta/examples and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 24 05:41:43 EDT 2011
Author: mmusgrov
Date: 2011-06-24 05:41:42 -0400 (Fri, 24 Jun 2011)
New Revision: 37148
Modified:
labs/jbosstm/trunk/ArjunaJTA/examples/javax_transaction/src/main/java/org/jboss/narayana/jta/examples/TransactionExample.java
labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/FileStoreExample.java
labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java
labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/VolatileStoreExample.java
labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/BasicXAExample.java
labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/DummyRecovery.java
labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/RecoverySetup.java
Log:
[JBTM-854] the maven exec:java goal does not support enabling java assertions via the command line - using conditions and exceptions instead
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/javax_transaction/src/main/java/org/jboss/narayana/jta/examples/TransactionExample.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/javax_transaction/src/main/java/org/jboss/narayana/jta/examples/TransactionExample.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/javax_transaction/src/main/java/org/jboss/narayana/jta/examples/TransactionExample.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -87,11 +87,14 @@
utx.begin();
// abort the transaction
- assert (utx.getStatus() == Status.STATUS_ACTIVE);
+ if (utx.getStatus() != Status.STATUS_ACTIVE)
+ throw new RuntimeException("transaction should have been active");
utx.setRollbackOnly();
- assert (utx.getStatus() == Status.STATUS_MARKED_ROLLBACK);
+ if (utx.getStatus() != Status.STATUS_MARKED_ROLLBACK)
+ throw new RuntimeException("transaction should have been marked rollback only");
utx.rollback();
- assert (utx.getStatus() == Status.STATUS_NO_TRANSACTION);
+ if (utx.getStatus() != Status.STATUS_NO_TRANSACTION)
+ throw new RuntimeException("transaction should not exist");
}
public void transactionTimeout() throws SystemException, NotSupportedException, InterruptedException, HeuristicRollbackException, HeuristicMixedException {
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/FileStoreExample.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/FileStoreExample.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/FileStoreExample.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -37,7 +37,8 @@
utx.begin();
utx.commit();
- assert (new File(storeDir).exists());
+ if (!new File(storeDir).exists())
+ throw new RuntimeException(storeDir + " should have been created");
}
public static void setupStore() throws Exception {
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/HornetqStoreExample.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -38,7 +38,8 @@
utx.begin();
utx.commit();
- assert (new File(storeDir).exists());
+ if (!new File(storeDir).exists())
+ throw new RuntimeException(storeDir + " should have been created");
}
public static void setupStore() throws Exception {
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/VolatileStoreExample.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/VolatileStoreExample.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/object_store/src/main/java/org/jboss/narayana/jta/examples/VolatileStoreExample.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -37,7 +37,8 @@
utx.begin();
utx.commit();
- assert (!new File(defaultStoreDir).exists());
+ if (new File(defaultStoreDir).exists())
+ throw new RuntimeException(defaultStoreDir + ": store directory should not have been created");
}
public static void setupStore() throws Exception {
@@ -45,5 +46,6 @@
BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "default").setObjectStoreType(storeClassName);
BeanPopulator.getNamedInstance(ObjectStoreEnvironmentBean.class, "communicationStore").setObjectStoreType(storeClassName);
+ Util.emptyObjectStore();
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/BasicXAExample.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/BasicXAExample.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/BasicXAExample.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -45,13 +45,17 @@
tm.getTransaction().enlistResource(xares1);
tm.getTransaction().enlistResource(xares2);
- assert (xares1.startCalled);
+ if (!xares1.startCalled)
+ throw new RuntimeException("start should have called");
// commit any transactional work that was done on the two dummy XA resources
tm.commit();
- assert (xares1.endCalled);
- assert (xares1.prepareCalled);
- assert (xares1.commitCalled);
+ if (!xares1.endCalled)
+ throw new RuntimeException("end should have called");
+ if (!xares1.prepareCalled)
+ throw new RuntimeException("prepare should have called");
+ if (!xares1.commitCalled)
+ throw new RuntimeException("commit should have called");
}
}
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/DummyRecovery.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/DummyRecovery.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/DummyRecovery.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -21,6 +21,8 @@
package org.jboss.narayana.jta.examples.recovery;
import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
+import com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean;
+import com.arjuna.ats.arjuna.recovery.RecoveryManager;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
import org.jboss.narayana.jta.examples.util.DummyXAResource;
import org.jboss.narayana.jta.examples.util.Util;
@@ -45,14 +47,6 @@
}
}
- public static void beforeClass() {
- startRecovery();
- }
-
- public static void afterClass() {
- stopRecovery();
- }
-
public void enlistmentFailure() throws NotSupportedException, RollbackException, SystemException, HeuristicMixedException, HeuristicRollbackException {
if (Util.countLogRecords() != 0)
return;
Modified: labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/RecoverySetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/RecoverySetup.java 2011-06-24 09:21:57 UTC (rev 37147)
+++ labs/jbosstm/trunk/ArjunaJTA/examples/recovery/src/main/java/org/jboss/narayana/jta/examples/recovery/RecoverySetup.java 2011-06-24 09:41:42 UTC (rev 37148)
@@ -20,19 +20,16 @@
*/
package org.jboss.narayana.jta.examples.recovery;
+
import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean;
import com.arjuna.ats.arjuna.common.RecoveryEnvironmentBean;
import com.arjuna.ats.arjuna.recovery.RecoveryManager;
import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
import org.jboss.narayana.jta.examples.util.Util;
-
-import javax.transaction.*;
-
public class RecoverySetup {
protected static RecoveryManager recoveryManager;
-// @BeforeClass
public static void startRecovery() {
BeanPopulator.getDefaultInstance(ObjectStoreEnvironmentBean.class).setObjectStoreDir(Util.recoveryStoreDir);
RecoveryManager.delayRecoveryManagerThread() ;
@@ -40,7 +37,6 @@
recoveryManager = RecoveryManager.manager();
}
-// @AfterClass
public static void stopRecovery() {
recoveryManager.terminate();
}
More information about the jboss-svn-commits
mailing list