Fix/hibernate session integration tests 14920

grails-test-core/build.gradle

@@ -31,6 +31,7 @@ dependencies {
     implementation platform(project(':grails-bom'))
 
     api 'org.springframework:spring-tx'
+
 
     api 'org.springframework.boot:spring-boot-test'
     // Testing

grails-testing-support-core/build.gradle

@@ -47,7 +47,8 @@ dependencies {
 
     api project(':grails-databinding')
     api project(':grails-datamapping-core')
-    api project(':grails-test-core')
+    api project(':grails-core')
+    api('org.spockframework:spock-core') { transitive = false }
     api 'org.springframework.boot:spring-boot-test'
     api('org.spockframework:spock-spring') { transitive = false }
     api 'org.junit.jupiter:junit-jupiter-api'

grails-test-core/src/main/groovy/org/grails/test/spock/WithSessionSpecExtension.groovy → grails-testing-support-core/src/main/groovy/org/grails/test/spock/WithSessionSpecExtension.groovy

@@ -72,13 +72,13 @@ class WithSessionSpecExtension implements IAnnotationDrivenExtension<WithSession
 
                 // Configure datasources from annotation
                 if (annotation.datasources().length > 0) {
-                    // Create a mock test object with datasources property
-                    def testWrapper = new Expando()
-                    testWrapper.withSession = annotation.datasources() as List
-                    sessionInterceptor.shouldBindSessions(testWrapper)
+                    // Create a simple map with datasources list
+                    def testConfig = [withSession: annotation.datasources() as List]
+                    sessionInterceptor.shouldBindSessions(testConfig)
                 } else {
                     // Bind all datasources
-                    sessionInterceptor.shouldBindSessions([withSession: true])
+                    def testConfig = [withSession: true]
+                    sessionInterceptor.shouldBindSessions(testConfig)
                 }
 
                 try {

grails-test-core/src/main/groovy/org/grails/test/support/GrailsTestSessionInterceptor.groovy → grails-testing-support-core/src/main/groovy/org/grails/test/support/GrailsTestSessionInterceptor.groovy

@@ -57,9 +57,12 @@ class GrailsTestSessionInterceptor {
             datasourceNames << ConnectionSource.DEFAULT
         }
 
-        for (name in applicationContext.grailsApplication.config.keySet()) {
-            if (name.startsWith('dataSource_')) {
-                datasourceNames << name - 'dataSource_'
+        // Check for additional datasources by looking for sessionFactory beans
+        String[] beanNames = applicationContext.getBeanNamesForType(SessionFactory)
+        for (String beanName : beanNames) {
+            if (beanName.startsWith('sessionFactory_')) {
+                String datasourceName = beanName.substring('sessionFactory_'.length())
+                datasourceNames << datasourceName
             }
         }
 
@@ -88,7 +91,13 @@ class GrailsTestSessionInterceptor {
         }
 
         // Check for property-based configuration
-        def value = test.hasProperty(WITH_SESSION) ? test[WITH_SESSION] : null
+        def value = null
+        if (test instanceof Map) {
+            value = test[WITH_SESSION]
+        } else if (test.metaClass.hasProperty(test, WITH_SESSION)) {
+            value = test[WITH_SESSION]
+        }
+
         if (value instanceof Boolean && value) {
             // Bind sessions for all datasources if withSession = true
             datasourcesToBind.addAll(sessionFactories.keySet())
@@ -133,7 +142,7 @@ class GrailsTestSessionInterceptor {
 
             Session session = sessionFactory.openSession()
             // Set flush mode to MANUAL to match OISV behavior
-            session.hibernateFlushMode = FlushMode.MANUAL
+            session.flushMode = FlushMode.MANUAL
 
             SessionHolder holder = new SessionHolder(session)
             TransactionSynchronizationManager.bindResource(sessionFactory, holder)

grails-testing-support-core/src/main/groovy/org/grails/testing/context/junit4/GrailsTestConfiguration.java

@@ -18,7 +18,7 @@
  */
 package org.grails.testing.context.junit4;
 
-import grails.boot.test.GrailsApplicationContextLoader;
+import org.springframework.boot.test.context.SpringBootContextLoader;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -29,7 +29,7 @@
  * @author Graeme Rocher
  * @since 3.0
  */
-@ContextConfiguration(loader = GrailsApplicationContextLoader.class)
+@ContextConfiguration(loader = SpringBootContextLoader.class)
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)

grails-testing-support-core/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension

@@ -1 +1 @@
-org.grails.testing.spock.TestingSupportExtension
+org.grails.test.spock.WithSessionSpecExtension