You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/06/01 10:25:56 UTC

(grails-core) branch refactor/tck-add-all-domain-classes updated: refactor: register required domain classes explicitly in setupSpec

This is an automated email from the ASF dual-hosted git repository.

borinquenkid pushed a commit to branch refactor/tck-add-all-domain-classes
in repository https://gitbox.apache.org/repos/asf/grails-core.git


The following commit(s) were added to refs/heads/refactor/tck-add-all-domain-classes by this push:
     new b4f3d9c1fb refactor: register required domain classes explicitly in setupSpec
b4f3d9c1fb is described below

commit b4f3d9c1fb3690aac9c8cec3bd828cd5560c637b
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Mon Jun 1 05:25:07 2026 -0500

    refactor: register required domain classes explicitly in setupSpec
    
    Register domain classes explicitly in the setupSpec method of the mapping TCK and Hibernate specifications. This resolves issues arising from the domainClasses list in GrailsDataTckManager starting empty.
---
 .../tests/HibernateOptimisticLockingSpec.groovy    |  4 ++++
 .../gorm/tests/HibernateValidationSpec.groovy      |  4 ++--
 .../testing/tck/base/GrailsDataTckManager.groovy   | 26 ----------------------
 .../data/testing/tck/tests/AttachMethodSpec.groovy |  1 -
 .../testing/tck/tests/CircularOneToManySpec.groovy |  1 -
 .../tck/tests/CommonTypesPersistenceSpec.groovy    |  6 +++++
 .../testing/tck/tests/CriteriaBuilderSpec.groovy   |  7 ++++++
 .../testing/tck/tests/CrudOperationsSpec.groovy    |  7 ++++++
 .../data/testing/tck/tests/DeleteAllSpec.groovy    |  6 +++++
 .../testing/tck/tests/DetachedCriteriaSpec.groovy  |  6 +++++
 .../data/testing/tck/tests/DomainEventsSpec.groovy |  7 ++++++
 .../grails/data/testing/tck/tests/EnumSpec.groovy  |  7 ++++++
 .../testing/tck/tests/FindByExampleSpec.groovy     |  6 +++++
 .../data/testing/tck/tests/FindByMethodSpec.groovy |  8 +++++++
 .../testing/tck/tests/FindOrCreateWhereSpec.groovy |  6 +++++
 .../testing/tck/tests/FindOrSaveWhereSpec.groovy   |  6 +++++
 .../data/testing/tck/tests/FindWhereSpec.groovy    |  6 +++++
 .../data/testing/tck/tests/GormEnhancerSpec.groovy |  7 ++++++
 .../testing/tck/tests/GormValidateableSpec.groovy  |  6 +++++
 .../data/testing/tck/tests/GroovyProxySpec.groovy  |  6 +++++
 .../data/testing/tck/tests/InheritanceSpec.groovy  |  2 +-
 .../data/testing/tck/tests/ListOrderBySpec.groovy  |  7 ++++++
 .../data/testing/tck/tests/NegationSpec.groovy     |  6 +++++
 .../data/testing/tck/tests/NotInListSpec.groovy    |  6 +++++
 .../testing/tck/tests/NullValueEqualSpec.groovy    |  6 +++++
 .../data/testing/tck/tests/OneToManySpec.groovy    |  9 ++++++++
 .../data/testing/tck/tests/OneToOneSpec.groovy     |  9 ++++++++
 .../testing/tck/tests/OptimisticLockingSpec.groovy |  7 ++++++
 .../data/testing/tck/tests/OrderBySpec.groovy      |  7 ++++++
 .../data/testing/tck/tests/PagedResultSpec.groovy  |  6 +++++
 .../data/testing/tck/tests/ProxyLoadingSpec.groovy |  7 ++++++
 .../tck/tests/QueryAfterPropertyChangeSpec.groovy  |  6 +++++
 .../tck/tests/QueryByAssociationSpec.groovy        |  7 ++++++
 .../data/testing/tck/tests/QueryByNullSpec.groovy  |  6 +++++
 .../data/testing/tck/tests/RangeQuerySpec.groovy   |  9 ++++++++
 .../data/testing/tck/tests/SaveAllSpec.groovy      |  6 +++++
 .../tck/tests/SessionCreationEventSpec.groovy      |  6 +++++
 .../data/testing/tck/tests/SizeQuerySpec.groovy    |  7 ++++++
 .../testing/tck/tests/WithTransactionSpec.groovy   |  7 ++++++
 39 files changed, 228 insertions(+), 31 deletions(-)

diff --git a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy
index 5d15897f77..37111d38c7 100644
--- a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateOptimisticLockingSpec.groovy
@@ -29,6 +29,10 @@ import org.grails.orm.hibernate.support.hibernate5.HibernateOptimisticLockingFai
  */
 class HibernateOptimisticLockingSpec extends GrailsDataTckSpec<GrailsDataHibernate5TckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([OptLockNotVersioned, OptLockVersioned])
+    }
+
     void "Test optimistic locking"() {
 
         given:
diff --git a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy
index bfddc3a008..3d088dfff0 100644
--- a/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/grails/gorm/tests/HibernateValidationSpec.groovy
@@ -32,8 +32,8 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  */
 class HibernateValidationSpec extends GrailsDataTckSpec<GrailsDataHibernate5TckManager> {
     void setupSpec() {
-        manager.addAllDomainClasses([ClassWithListArgBeforeValidate, ClassWithNoArgBeforeValidate,
-                                 ClassWithOverloadedBeforeValidate])
+        manager.addAllDomainClasses([ChildEntity, ClassWithListArgBeforeValidate, ClassWithNoArgBeforeValidate,
+                                 ClassWithOverloadedBeforeValidate, TestEntity])
     }
 
     void "Test that validate works without a bound Session"() {
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
index 4c66fcf5e8..d1d3fb6796 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/base/GrailsDataTckManager.groovy
@@ -20,31 +20,6 @@ package org.apache.grails.data.testing.tck.base
 
 import spock.lang.Specification
 
-import org.apache.grails.data.testing.tck.domains.Book
-import org.apache.grails.data.testing.tck.domains.ChildEntity
-import org.apache.grails.data.testing.tck.domains.City
-import org.apache.grails.data.testing.tck.domains.ClassWithListArgBeforeValidate
-import org.apache.grails.data.testing.tck.domains.ClassWithNoArgBeforeValidate
-import org.apache.grails.data.testing.tck.domains.ClassWithOverloadedBeforeValidate
-import org.apache.grails.data.testing.tck.domains.CommonTypes
-import org.apache.grails.data.testing.tck.domains.Country
-import org.apache.grails.data.testing.tck.domains.EnumThing
-import org.apache.grails.data.testing.tck.domains.Face
-import org.apache.grails.data.testing.tck.domains.Highway
-import org.apache.grails.data.testing.tck.domains.Location
-import org.apache.grails.data.testing.tck.domains.ModifyPerson
-import org.apache.grails.data.testing.tck.domains.Nose
-import org.apache.grails.data.testing.tck.domains.OptLockNotVersioned
-import org.apache.grails.data.testing.tck.domains.OptLockVersioned
-import org.apache.grails.data.testing.tck.domains.Person
-import org.apache.grails.data.testing.tck.domains.PersonEvent
-import org.apache.grails.data.testing.tck.domains.Pet
-import org.apache.grails.data.testing.tck.domains.PetType
-import org.apache.grails.data.testing.tck.domains.Plant
-import org.apache.grails.data.testing.tck.domains.PlantCategory
-import org.apache.grails.data.testing.tck.domains.Publication
-import org.apache.grails.data.testing.tck.domains.Task
-import org.apache.grails.data.testing.tck.domains.TestEntity
 import org.grails.datastore.mapping.core.DatastoreUtils
 import org.grails.datastore.mapping.core.Session
 
@@ -59,7 +34,6 @@ abstract class GrailsDataTckManager {
     private List<Class> domainClasses = [
     ]
 
-
 /**
  * Returns a defensive copy of the registered domain classes.
  * Mutating this array will not affect the manager state.
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/AttachMethodSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/AttachMethodSpec.groovy
index dae1deb2a7..4e4e319065 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/AttachMethodSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/AttachMethodSpec.groovy
@@ -20,7 +20,6 @@ package org.apache.grails.data.testing.tck.tests
 
 import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 import org.apache.grails.data.testing.tck.domains.Person
-import org.apache.grails.data.testing.tck.domains.Task
 
 /**
  * @author graemerocher
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CircularOneToManySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CircularOneToManySpec.groovy
index ef599ce1d6..0877be2c36 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CircularOneToManySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CircularOneToManySpec.groovy
@@ -19,7 +19,6 @@
 package org.apache.grails.data.testing.tck.tests
 
 import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
-import org.apache.grails.data.testing.tck.domains.Practice
 import org.apache.grails.data.testing.tck.domains.Task
 
 /**
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CommonTypesPersistenceSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CommonTypesPersistenceSpec.groovy
index 5dbbcf4db1..b817640641 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CommonTypesPersistenceSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CommonTypesPersistenceSpec.groovy
@@ -26,6 +26,12 @@ import org.apache.grails.data.testing.tck.domains.CommonTypes
  */
 class CommonTypesPersistenceSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            CommonTypes
+        ])
+    }
+
     def testPersistBasicTypes() {
         given:
         def now = new Date()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CriteriaBuilderSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CriteriaBuilderSpec.groovy
index a85f788185..3ad3922225 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CriteriaBuilderSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CriteriaBuilderSpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class CriteriaBuilderSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test count distinct projection'() {
         given:
         def age = 40
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CrudOperationsSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CrudOperationsSpec.groovy
index f82fecb184..9d14773f05 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CrudOperationsSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/CrudOperationsSpec.groovy
@@ -30,6 +30,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class CrudOperationsSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test get using a string-based key'() {
         given:
         def t = new TestEntity(name: 'Bob', child: new ChildEntity(name: 'Child'))
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DeleteAllSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DeleteAllSpec.groovy
index e1babfaa01..0a0ebaeeba 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DeleteAllSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DeleteAllSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class DeleteAllSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Person
+        ])
+    }
+
     def 'Test that many objects can be deleted at once using multiple arguments'() {
         given:
         def bob = new Person(firstName: 'Bob', lastName: 'Builder').save(flush: true)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DetachedCriteriaSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DetachedCriteriaSpec.groovy
index a23ca037f0..02deca14ff 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DetachedCriteriaSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DetachedCriteriaSpec.groovy
@@ -25,6 +25,12 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class DetachedCriteriaSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Person
+        ])
+    }
+
     void 'Test the list method returns a PagedResultList with pagination arguments'() {
         given: 'A bunch of people'
         createPeople()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DomainEventsSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DomainEventsSpec.groovy
index 24ba4e7ed3..faabf71d57 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DomainEventsSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/DomainEventsSpec.groovy
@@ -31,6 +31,13 @@ import org.apache.grails.data.testing.tck.domains.PersonEvent
  */
 class DomainEventsSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ModifyPerson,
+            PersonEvent
+        ])
+    }
+
     def setup() {
         PersonEvent.resetStore()
     }
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/EnumSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/EnumSpec.groovy
index 17e3388390..03050cc610 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/EnumSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/EnumSpec.groovy
@@ -26,6 +26,13 @@ import org.apache.grails.data.testing.tck.domains.TestEnum
 
 class EnumSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            EnumThing,
+            TestEnum
+        ])
+    }
+
     void "Test save()"() {
         given:
 
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByExampleSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByExampleSpec.groovy
index c76621cdd0..b006c8d51b 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByExampleSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByExampleSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.Plant
 
 class FindByExampleSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Plant
+        ])
+    }
+
     def 'Test findAll by example'() {
         given:
         new Plant(name: 'Pineapple', goesInPatch: false).save()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByMethodSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByMethodSpec.groovy
index be7988712d..6a0e10e19a 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByMethodSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindByMethodSpec.groovy
@@ -28,6 +28,14 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class FindByMethodSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Book,
+            Highway,
+            Person
+        ])
+    }
+
     void 'Test Using AND Multiple Times In A Dynamic Finder'() {
         given:
         new Person(firstName: 'Jake', lastName: 'Brown', age: 11).save()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrCreateWhereSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrCreateWhereSpec.groovy
index 7ebfdcbe2f..38bacab300 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrCreateWhereSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrCreateWhereSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class FindOrCreateWhereSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     def "Test findOrCreateWhere returns a new instance if it doesn't exist in the database"() {
         when:
         def entity = TestEntity.findOrCreateWhere(name: 'Fripp', age: 64)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrSaveWhereSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrSaveWhereSpec.groovy
index cf2c7f776f..9df67add3e 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrSaveWhereSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindOrSaveWhereSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class FindOrSaveWhereSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     def "Test findOrSaveWhere returns a new instance if it doesn't exist in the database"() {
         when:
         def entity = TestEntity.findOrSaveWhere(name: 'Lake', age: 63)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindWhereSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindWhereSpec.groovy
index 186c137778..9c46a805d8 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindWhereSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/FindWhereSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class FindWhereSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     def 'Test findWhere returns a matching Instance'() {
         given:
         def entityId = new TestEntity(name: 'David', age: 27).save().id
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormEnhancerSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormEnhancerSpec.groovy
index 82df26c899..b6552b9898 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormEnhancerSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormEnhancerSpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class GormEnhancerSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test basic CRUD operations'() {
         given:
         def t
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormValidateableSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormValidateableSpec.groovy
index a6a0f22f52..1c18805062 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormValidateableSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormValidateableSpec.groovy
@@ -24,6 +24,12 @@ import org.grails.datastore.gorm.GormValidateable
 
 class GormValidateableSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     void 'Test that a class marked with @Entity implements GormValidateable'() {
         expect:
         GormValidateable.isAssignableFrom(TestEntity)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GroovyProxySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GroovyProxySpec.groovy
index 0780228a7b..46e908d418 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GroovyProxySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GroovyProxySpec.groovy
@@ -33,6 +33,12 @@ import org.grails.datastore.gorm.proxy.GroovyProxyFactory
 // this test is ignored because Groovy proxies are not used with Hibernate
 class GroovyProxySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Location
+        ])
+    }
+
     void 'Test proxying of non-existent instance throws an exception'() {
         setup:
         if (useGroovyProxyFactory) {
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/InheritanceSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/InheritanceSpec.groovy
index d215818d71..673ce86910 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/InheritanceSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/InheritanceSpec.groovy
@@ -30,7 +30,7 @@ import org.apache.grails.data.testing.tck.domains.Practice
 class InheritanceSpec extends GrailsDataTckSpec {
 
     void setupSpec() {
-        manager.addAllDomainClasses([Practice])
+        manager.addAllDomainClasses([City, Country, Location, Practice])
     }
 
     void 'Test inheritance with dynamic finder'() {
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ListOrderBySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ListOrderBySpec.groovy
index 86bcb454bb..e20d7e29a7 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ListOrderBySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ListOrderBySpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class ListOrderBySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test listOrderBy property name method'() {
         given:
         def child = new ChildEntity(name: 'Child')
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NegationSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NegationSpec.groovy
index d7f9de1952..2775bcb317 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NegationSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NegationSpec.groovy
@@ -26,6 +26,12 @@ import org.apache.grails.data.testing.tck.domains.Book
  */
 class NegationSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Book
+        ])
+    }
+
     void 'Test negation in dynamic finder'() {
         given:
         new Book(title: 'The Stand', author: 'Stephen King').save()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NotInListSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NotInListSpec.groovy
index 036aaadfda..4f5787caad 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NotInListSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NotInListSpec.groovy
@@ -26,6 +26,12 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class NotInListSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     void 'test not in list returns the correct results'() {
         when:
         new TestEntity(name: 'Fred').save()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NullValueEqualSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NullValueEqualSpec.groovy
index 496d37f3f8..eb3c1e227b 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NullValueEqualSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NullValueEqualSpec.groovy
@@ -25,6 +25,12 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class NullValueEqualSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     void 'test null value in equal'() {
         when:
         new TestEntity(name: 'Fred', age: null).save(failOnError: true)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToManySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToManySpec.groovy
index 0219d3ca6b..9f88bb42c1 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToManySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToManySpec.groovy
@@ -30,6 +30,15 @@ import org.apache.grails.data.testing.tck.domains.PetType
  */
 class OneToManySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Country,
+            Person,
+            Pet,
+            PetType
+        ])
+    }
+
     void 'test save and return unidirectional one to many'() {
         given:
         Person p = new Person(firstName: 'Fred', lastName: 'Flinstone')
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToOneSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToOneSpec.groovy
index 5723e3b314..944ef1a0f1 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToOneSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OneToOneSpec.groovy
@@ -27,6 +27,15 @@ import org.grails.datastore.mapping.model.types.OneToOne
 
 class OneToOneSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Face,
+            Nose,
+            Person,
+            Pet
+        ])
+    }
+
     def 'Test persist and retrieve unidirectional many-to-one'() {
         given: 'A domain model with a many-to-one'
         def person = new Person(firstName: 'Fred', lastName: 'Flintstone')
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OptimisticLockingSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OptimisticLockingSpec.groovy
index e0027fb40e..383d7d8d9c 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OptimisticLockingSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OptimisticLockingSpec.groovy
@@ -30,6 +30,13 @@ import org.grails.datastore.mapping.core.OptimisticLockingException
  */
 class OptimisticLockingSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            OptLockNotVersioned,
+            OptLockVersioned
+        ])
+    }
+
     void "Test versioning"() {
 
         given:
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OrderBySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OrderBySpec.groovy
index e4a4fb516d..996c775557 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OrderBySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/OrderBySpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class OrderBySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test order with criteria'() {
         given:
         def age = 40
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpec.groovy
index 8cb9e6b7b9..663dda32b1 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/PagedResultSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class PagedResultSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Person
+        ])
+    }
+
     void 'Test that a getTotalCount will return 0 on empty result from the list() method'() {
         when: 'A query is executed that returns no results'
         def results = Person.list(max: 1)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ProxyLoadingSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ProxyLoadingSpec.groovy
index b3219f4833..ba421b247a 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ProxyLoadingSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ProxyLoadingSpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class ProxyLoadingSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test load proxied instance directly'() {
 
         given:
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryAfterPropertyChangeSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryAfterPropertyChangeSpec.groovy
index 10889d6c00..f63cfa4d16 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryAfterPropertyChangeSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryAfterPropertyChangeSpec.groovy
@@ -27,6 +27,12 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class QueryAfterPropertyChangeSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Person
+        ])
+    }
+
     void 'Test that an entity is de-indexed after a change to an indexed property'() {
         given:
         def person = new Person(firstName: 'Homer', lastName: 'Simpson').save(flush: true)
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByAssociationSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByAssociationSpec.groovy
index 3f7d9b17b0..f5e5faba6e 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByAssociationSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByAssociationSpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class QueryByAssociationSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test query entity by single-ended association'() {
         given:
         def age = 40
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByNullSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByNullSpec.groovy
index 1142111138..c637195b90 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByNullSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryByNullSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class QueryByNullSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Person
+        ])
+    }
+
     void 'Test passing null as the sole argument to a dynamic finder multiple times'() {
         // see GRAILS-3463
         when:
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RangeQuerySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RangeQuerySpec.groovy
index abf02975cb..c0a308d104 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RangeQuerySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/RangeQuerySpec.groovy
@@ -31,6 +31,15 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class RangeQuerySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            Person,
+            Publication,
+            TestEntity
+        ])
+    }
+
     void 'Test between query with dates'() {
         given:
         def now = new Date()
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SaveAllSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SaveAllSpec.groovy
index 990a67aba0..aae71eb097 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SaveAllSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SaveAllSpec.groovy
@@ -23,6 +23,12 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class SaveAllSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Person
+        ])
+    }
+
     def 'Test that many objects can be saved at once using multiple arguments'() {
         given:
         def bob = new Person(firstName: 'Bob', lastName: 'Builder')
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SessionCreationEventSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SessionCreationEventSpec.groovy
index d29323a1ee..562e924db0 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SessionCreationEventSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SessionCreationEventSpec.groovy
@@ -35,6 +35,12 @@ import org.grails.datastore.mapping.core.SessionCreationEvent
 @IgnoreIf({ System.getProperty('hibernate5.gorm.suite') || System.getProperty('hibernate6.gorm.suite')  || System.getProperty('mongodb.gorm.suite') })
 class SessionCreationEventSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            TestEntity
+        ])
+    }
+
     Listener listener
 
     def setup() {
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpec.groovy
index 8db56a53fb..0d488f4cc7 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/SizeQuerySpec.groovy
@@ -27,6 +27,13 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class SizeQuerySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            Country,
+            Person
+        ])
+    }
+
     void 'Test sizeLe criterion'() {
         given: 'A country with only 1 resident'
         Person p = new Person(firstName: 'Fred', lastName: 'Flinstone')
diff --git a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/WithTransactionSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/WithTransactionSpec.groovy
index 63787c4894..6a167b7ed6 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/WithTransactionSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/WithTransactionSpec.groovy
@@ -29,6 +29,13 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class WithTransactionSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([
+            ChildEntity,
+            TestEntity
+        ])
+    }
+
     void 'Test save() with transaction'() {
         given:
         TestEntity.withTransaction {