XA Test with existing transaction

Author: emacarron

src/test/java/org/mybatis/spring/submitted/xa/UserServiceTest.java

@@ -15,6 +15,8 @@
  */
 package org.mybatis.spring.submitted.xa;
 
+import javax.transaction.UserTransaction;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,6 +27,8 @@
 @RunWith(value = SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:org/mybatis/spring/submitted/xa/applicationContext.xml")
 public class UserServiceTest {
+
+  @Autowired UserTransaction userTransaction;
 
   @Autowired
   private UserService userService;
@@ -47,4 +51,22 @@ public void testRollback() {
     Assert.assertFalse(userService.checkUserExists(user.getId()));
   }
 
+  @Test
+  public void testCommitWithExistingTx() throws Exception {
+    userTransaction.begin();
+    User user = new User(3, "Pocoyo");
+    userService.saveWithNoFailure(user);
+    userTransaction.commit();
+    Assert.assertTrue(userService.checkUserExists(user.getId()));
+  }
+
+  @Test
+  public void testRollbackWithExistingTx() throws Exception {
+    userTransaction.begin();
+    User user = new User(4, "Pocoyo");
+    userService.saveWithNoFailure(user);
+    userTransaction.rollback();
+    Assert.assertFalse(userService.checkUserExists(user.getId()));
+  }
+  
 }

src/test/java/org/mybatis/spring/submitted/xa/applicationContext.xml

@@ -24,7 +24,8 @@
      http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
      http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
      http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+     default-autowire="byName">
 
 	<bean id="userTransactionService" class="com.atomikos.icatch.config.UserTransactionServiceImp"
 		init-method="init" destroy-method="shutdownForce">
@@ -42,7 +43,7 @@
 	</bean>
 
 	<!-- Construct Atomikos UserTransactionManager, needed to configure Spring -->
-	<bean id="AtomikosTransactionManager" class="com.atomikos.icatch.jta.UserTransactionManager"
+	<bean id="transactionManager" class="com.atomikos.icatch.jta.UserTransactionManager"
 		init-method="init" destroy-method="close" depends-on="userTransactionService">
 
 		<!-- IMPORTANT: disable startup because the userTransactionService above 
@@ -55,7 +56,7 @@
 	</bean>
 
 	<!-- Also use Atomikos UserTransactionImp, needed to configure Spring -->
-	<bean id="AtomikosUserTransaction" class="com.atomikos.icatch.jta.UserTransactionImp"
+	<bean id="userTransaction" class="com.atomikos.icatch.jta.UserTransactionImp"
 		depends-on="userTransactionService">
 		<property name="transactionTimeout" value="300" />
 	</bean>
@@ -64,8 +65,8 @@
 	<bean id="JtaTransactionManager"
 		class="org.springframework.transaction.jta.JtaTransactionManager"
 		depends-on="userTransactionService">
-		<property name="transactionManager" ref="AtomikosTransactionManager" />
-		<property name="userTransaction" ref="AtomikosUserTransaction" />
+		<property name="transactionManager" ref="transactionManager" />
+		<property name="userTransaction" ref="userTransaction" />
 	</bean>
 
 	<tx:annotation-driven transaction-manager="JtaTransactionManager" />