[CDI + JPA + JTA] Using rule instead of base class for JTA management

Author: gunnarmorling

other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/CdiJpaTest.java

@@ -10,14 +10,44 @@
 import java.util.List;
 import java.util.UUID;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.transaction.TransactionalException;
 import javax.transaction.UserTransaction;
 
+import org.hibernate.demos.jpacditesting.support.JtaEnvironment;
+import org.jboss.weld.environment.se.Weld;
+import org.jboss.weld.junit4.WeldInitiator;
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 
-public class CdiJpaTest extends CdiJpaTestBase {
+public class CdiJpaTest {
+
+    @ClassRule
+    public static JtaEnvironment jtaEnvironment = new JtaEnvironment();
+
+    @Rule
+    public WeldInitiator weld = WeldInitiator.from(new Weld())
+            .activate(RequestScoped.class)
+            .inject(this)
+            .build();
+
+    // new Weld() above enables scanning of the classpath; alternatively, only the required beans can be listed explicitly:
+
+//    @Rule
+//    public WeldInitiator weld = WeldInitiator.from(
+//            ObserverTestBean.class,
+//            TransactionalTestService.class,
+//            TestService.class,
+//            EntityManagerProducer.class,
+//            EntityManagerFactoryProducer.class,
+//            TransactionExtension.class
+//        )
+//        .activate(RequestScoped.class)
+//        .inject(this)
+//        .build();
 
     @Inject
     private EntityManager entityManager;

other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/CdiJpaTestBase.java

@@ -0,0 +1,29 @@
+/*
+ * License: Apache License, Version 2.0
+ * See the LICENSE file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.demos.jpacditesting.support;
+
+import org.jnp.server.NamingBeanImpl;
+import org.junit.rules.ExternalResource;
+
+import com.arjuna.ats.jta.utils.JNDIManager;
+
+public class JtaEnvironment extends ExternalResource {
+
+    private NamingBeanImpl NAMING_BEAN;
+
+    @Override
+    protected void before() throws Throwable {
+        NAMING_BEAN = new NamingBeanImpl();
+        NAMING_BEAN.start();
+
+        JNDIManager.bindJTAImplementation();
+        TransactionalConnectionProvider.bindDataSource();
+    }
+
+    @Override
+    protected void after() {
+        NAMING_BEAN.stop();
+    }
+}