Fix tests

micronaut-projects · Mar 4, 2025 · 4978d8d · 4978d8d
1 parent 508d1c2
commit 4978d8d
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 25 deletions.
diff --git a/data-jdbc/src/test/groovy/io/micronaut/data/jdbc/AbstractJdbcTransactionSpec.groovy b/data-jdbc/src/test/groovy/io/micronaut/data/jdbc/AbstractJdbcTransactionSpec.groovy
@@ -1,5 +1,7 @@
 package io.micronaut.data.jdbc
 
+import io.micronaut.data.connection.ConnectionOperations
+import io.micronaut.data.connection.jdbc.operations.DataSourceConnectionOperations
 import io.micronaut.data.connection.jdbc.operations.DefaultDataSourceConnectionOperations
 import io.micronaut.data.tck.tests.AbstractTransactionSpec
 import io.micronaut.transaction.TransactionOperations
@@ -14,6 +16,11 @@ abstract class AbstractJdbcTransactionSpec extends AbstractTransactionSpec {
         return context.getBean(DataSourceTransactionManager)
     }
 
+    @Override
+    protected ConnectionOperations getConnectionOperations() {
+        return context.getBean(DataSourceConnectionOperations)
+    }
+
     @Override
     protected Runnable getNoTxCheck() {
         DefaultDataSourceConnectionOperations connectionOperations = context.getBean(DefaultDataSourceConnectionOperations)

diff --git a/...pring-jdbc/src/test/groovy/io/micronaut/data/spring/jdbc/SpringJdbcTransactionSpec.groovy b/...pring-jdbc/src/test/groovy/io/micronaut/data/spring/jdbc/SpringJdbcTransactionSpec.groovy
@@ -15,7 +15,7 @@
  */
 package io.micronaut.data.spring.jdbc
 
-
+import io.micronaut.data.connection.ConnectionOperations
 import io.micronaut.data.spring.jdbc.micronaut.H2BookRepository
 import io.micronaut.data.tck.repositories.BookRepository
 import io.micronaut.data.tck.tests.AbstractTransactionSpec
@@ -45,6 +45,11 @@ class SpringJdbcTransactionSpec extends AbstractTransactionSpec {
         return context.getBean(SpringJdbcTransactionOperations)
     }
 
+    @Override
+    protected ConnectionOperations getConnectionOperations() {
+        return context.getBean(SpringJdbcConnectionOperations)
+    }
+
     @Override
     protected Runnable getNoTxCheck() {
         return new Runnable() {

diff --git a/...bc/src/test/groovy/io/micronaut/data/spring/jdbc/SpringPostgresJdbcTransactionSpec.groovy b/...bc/src/test/groovy/io/micronaut/data/spring/jdbc/SpringPostgresJdbcTransactionSpec.groovy
@@ -15,7 +15,7 @@
  */
 package io.micronaut.data.spring.jdbc
 
-
+import io.micronaut.data.connection.ConnectionOperations
 import io.micronaut.data.model.query.builder.sql.Dialect
 import io.micronaut.data.spring.jdbc.micronaut.PostgresBookRepository
 import io.micronaut.data.tck.repositories.BookRepository
@@ -44,6 +44,11 @@ class SpringPostgresJdbcTransactionSpec extends AbstractTransactionSpec implemen
         return context.getBean(SpringJdbcTransactionOperations)
     }
 
+    @Override
+    protected ConnectionOperations getConnectionOperations() {
+        return context.getBean(SpringJdbcConnectionOperations)
+    }
+
     @Override
     protected Runnable getNoTxCheck() {
         return new Runnable() {

diff --git a/.../src/test/groovy/io/micronaut/data/spring/hibernate/SpringHibernateTransactionSpec.groovy b/.../src/test/groovy/io/micronaut/data/spring/hibernate/SpringHibernateTransactionSpec.groovy
@@ -15,9 +15,11 @@
  */
 package io.micronaut.data.spring.hibernate
 
+import io.micronaut.data.connection.ConnectionOperations
 import io.micronaut.data.model.query.builder.sql.Dialect
 import io.micronaut.data.spring.hibernate.micronaut.HibernateBookRepository
 import io.micronaut.data.spring.hibernate.micronaut.ReadOnlyTest
+import io.micronaut.data.spring.jpa.hibernate.SpringHibernateConnectionOperations
 import io.micronaut.data.spring.jpa.hibernate.SpringHibernateTransactionOperations
 import io.micronaut.data.tck.repositories.BookRepository
 import io.micronaut.data.tck.tests.AbstractTransactionSpec
@@ -55,6 +57,11 @@ class SpringHibernateTransactionSpec extends AbstractTransactionSpec implements
         return context.getBean(SpringHibernateTransactionOperations)
     }
 
+    @Override
+    protected ConnectionOperations getConnectionOperations() {
+        return context.getBean(SpringHibernateConnectionOperations)
+    }
+
     @Override
     protected Runnable getNoTxCheck() {
         return new Runnable() {

diff --git a/data-tck/src/main/groovy/io/micronaut/data/tck/tests/AbstractTransactionSpec.groovy b/data-tck/src/main/groovy/io/micronaut/data/tck/tests/AbstractTransactionSpec.groovy
@@ -1,6 +1,7 @@
 package io.micronaut.data.tck.tests
 
 import io.micronaut.context.ApplicationContext
+import io.micronaut.data.connection.ConnectionOperations
 import io.micronaut.data.tck.repositories.BookRepository
 import io.micronaut.data.tck.services.TxBookService
 import io.micronaut.data.tck.services.TxEventsService
@@ -29,10 +30,15 @@ abstract class AbstractTransactionSpec extends Specification implements TestProp
 
     protected abstract TransactionOperations getTransactionOperations();
 
+    protected abstract ConnectionOperations getConnectionOperations();
+
     protected abstract Runnable getNoTxCheck();
 
     TxBookService getBookService() {
-        return context.getBean(TxBookService)
+        def service = context.getBean(TxBookService)
+        service.transactionManager = getTransactionOperations()
+        service.connectionOperations = getConnectionOperations()
+        return service
     }
 
     void cleanup() {

diff --git a/data-tck/src/main/java/io/micronaut/data/tck/services/TxBookService.java b/data-tck/src/main/java/io/micronaut/data/tck/services/TxBookService.java
@@ -4,7 +4,6 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.data.connection.ConnectionOperations;
 import io.micronaut.data.connection.ConnectionStatus;
-import io.micronaut.data.connection.annotation.Connectable;
 import io.micronaut.transaction.SynchronousTransactionManager;
 import io.micronaut.transaction.TransactionDefinition;
 import io.micronaut.transaction.TransactionStatus;
@@ -18,32 +17,30 @@
 @Singleton
 public class TxBookService extends AbstractBookService {
 
-    private final SynchronousTransactionManager<Object> transactionManager;
-    private final ConnectionOperations<Object> connectionOperations;
+    public SynchronousTransactionManager<Object> transactionManager;
+    public ConnectionOperations<Object> connectionOperations;
 
-    public TxBookService(ApplicationContext beanContext,
-                         SynchronousTransactionManager<Object> transactionManager,
-                         ConnectionOperations<Object> connectionOperations) {
+    public TxBookService(ApplicationContext beanContext) {
         super(beanContext);
-        this.transactionManager = transactionManager;
-        this.connectionOperations = connectionOperations;
     }
 
-    @Connectable
     public void bookAddedInConnectableNestedTransaction() {
-        ConnectionStatus<Object> outerConnection = getConnection();
-        TransactionDefinition definition = new DefaultTransactionDefinition(TransactionDefinition.Propagation.NESTED);
-        TransactionStatus<Object> status = transactionManager.getTransaction(definition);
-        ConnectionStatus<Object> txConnection = getConnection();
-        if (!txConnection.equals(outerConnection)) {
-            throw new IllegalStateException("Connection is not the same as the outer connection");
-        }
-        bookRepository.save(newBook("MandatoryBook"));
-        transactionManager.commit(status);
-        ConnectionStatus<Object> afterTxConnection = getConnection();
-        if (!afterTxConnection.equals(outerConnection)) {
-            throw new IllegalStateException("Connection is not the same as the outer connection");
-        }
+        connectionOperations.executeWrite(connectionStatus -> {
+            ConnectionStatus<Object> outerConnection = getConnection();
+            TransactionDefinition definition = new DefaultTransactionDefinition(TransactionDefinition.Propagation.NESTED);
+            TransactionStatus<Object> status = transactionManager.getTransaction(definition);
+            ConnectionStatus<Object> txConnection = getConnection();
+            if (!txConnection.equals(outerConnection)) {
+                throw new IllegalStateException("Connection is not the same as the outer connection");
+            }
+            bookRepository.save(newBook("MandatoryBook"));
+            transactionManager.commit(status);
+            ConnectionStatus<Object> afterTxConnection = getConnection();
+            if (!afterTxConnection.equals(outerConnection)) {
+                throw new IllegalStateException("Connection is not the same as the outer connection");
+            }
+            return null;
+        });
     }
 
     private ConnectionStatus<Object> getConnection() {

diff --git a/...rnate/src/test/groovy/io/micronaut/transaction/hibernate6/HibernateTransactionSpec.groovy b/...rnate/src/test/groovy/io/micronaut/transaction/hibernate6/HibernateTransactionSpec.groovy
@@ -17,6 +17,7 @@ package io.micronaut.transaction.hibernate6
 
 import io.micronaut.core.type.Argument
 import io.micronaut.data.connection.ConnectionOperations
+import io.micronaut.data.hibernate.connection.HibernateConnectionOperations
 import io.micronaut.data.model.query.builder.sql.Dialect
 import io.micronaut.data.tck.repositories.BookRepository
 import io.micronaut.data.tck.tests.AbstractTransactionSpec
@@ -54,6 +55,11 @@ class HibernateTransactionSpec extends AbstractTransactionSpec implements TestRe
         return context.getBean(HibernateTransactionManager)
     }
 
+    @Override
+    protected ConnectionOperations getConnectionOperations() {
+        return context.getBean(HibernateConnectionOperations)
+    }
+
     @Override
     protected Runnable getNoTxCheck() {
         ConnectionOperations<Session> connectionOperations = context.getBean(Argument.of(ConnectionOperations.class, Session.class))