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 13:41:32 UTC

(grails-core) 01/01: Fix GORM TCK domain registration in test specifications

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

commit 0714a59b9728ed540108f4b3f163d3b78a4fa636
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Mon Jun 1 08:06:20 2026 -0500

    Fix GORM TCK domain registration in test specifications
    
    Explicitly register required domain classes in the setupSpec method of each specification that depends on them, rather than relying on a default pre-populated registry.
---
 .../core/GrailsDataHibernate5TckManager.groovy        |  4 ++--
 .../data/mongo/core/GrailsDataMongoTckManager.groovy  |  2 +-
 .../grails/gorm/tests/DeepValidateWithSaveSpec.groovy |  4 ++++
 .../grails/gorm/tests/JpaQueryBuilderSpec.groovy      |  4 ++++
 .../grails/gorm/tests/ReadOnlyCriteriaSpec.groovy     |  4 ++++
 .../groovy/grails/gorm/tests/SingleResultSpec.groovy  |  4 ++++
 .../test/groovy/grails/gorm/tests/SubquerySpec.groovy |  4 ++++
 .../groovy/grails/gorm/tests/WhereMethodSpec.groovy   |  2 +-
 .../grails/datastore/gorm/AsyncReadMethodsSpec.groovy |  4 ++++
 .../datastore/gorm/DistinctProjectionSpec.groovy      |  4 ++++
 .../org/grails/datastore/gorm/NotLikeSpec.groovy      |  4 ++++
 .../datastore/gorm/OneToOneWithProxiesSpec.groovy     |  5 +++++
 .../org/grails/datastore/gorm/OrderBySpec.groovy      |  6 ++++++
 .../grails/datastore/gorm/QueryAssociationSpec.groovy |  5 +++++
 .../data/testing/tck/base/GrailsDataTckManager.groovy | 19 +++++++++++++------
 .../data/testing/tck/tests/AttachMethodSpec.groovy    |  4 ++++
 .../testing/tck/tests/CircularOneToManySpec.groovy    |  4 ++++
 .../tck/tests/CommonTypesPersistenceSpec.groovy       |  4 ++++
 .../data/testing/tck/tests/CriteriaBuilderSpec.groovy |  5 +++++
 .../data/testing/tck/tests/CrudOperationsSpec.groovy  |  5 +++++
 .../data/testing/tck/tests/DeleteAllSpec.groovy       |  5 +++++
 .../testing/tck/tests/DetachedCriteriaSpec.groovy     |  5 +++++
 .../data/testing/tck/tests/DomainEventsSpec.groovy    |  5 +++++
 .../grails/data/testing/tck/tests/EnumSpec.groovy     |  5 +++++
 .../data/testing/tck/tests/FindByExampleSpec.groovy   |  5 +++++
 .../data/testing/tck/tests/FindByMethodSpec.groovy    |  5 +++++
 .../testing/tck/tests/FindOrCreateWhereSpec.groovy    |  5 +++++
 .../data/testing/tck/tests/FindOrSaveWhereSpec.groovy |  5 +++++
 .../data/testing/tck/tests/FindWhereSpec.groovy       |  5 +++++
 .../data/testing/tck/tests/GormEnhancerSpec.groovy    |  5 +++++
 .../data/testing/tck/tests/GroovyProxySpec.groovy     |  5 +++++
 .../data/testing/tck/tests/InheritanceSpec.groovy     |  2 +-
 .../data/testing/tck/tests/ListOrderBySpec.groovy     |  5 +++++
 .../grails/data/testing/tck/tests/NegationSpec.groovy |  5 +++++
 .../data/testing/tck/tests/NotInListSpec.groovy       |  5 +++++
 .../data/testing/tck/tests/NullValueEqualSpec.groovy  |  5 +++++
 .../data/testing/tck/tests/OneToManySpec.groovy       |  5 +++++
 .../grails/data/testing/tck/tests/OneToOneSpec.groovy |  5 +++++
 .../testing/tck/tests/OptimisticLockingSpec.groovy    |  5 +++++
 .../grails/data/testing/tck/tests/OrderBySpec.groovy  |  5 +++++
 .../data/testing/tck/tests/PagedResultSpec.groovy     |  5 +++++
 .../data/testing/tck/tests/ProxyLoadingSpec.groovy    |  5 +++++
 .../tck/tests/QueryAfterPropertyChangeSpec.groovy     |  5 +++++
 .../testing/tck/tests/QueryByAssociationSpec.groovy   |  5 +++++
 .../data/testing/tck/tests/QueryByNullSpec.groovy     |  5 +++++
 .../data/testing/tck/tests/QueryEventsSpec.groovy     |  2 +-
 .../data/testing/tck/tests/RangeQuerySpec.groovy      |  5 +++++
 .../grails/data/testing/tck/tests/SaveAllSpec.groovy  |  5 +++++
 .../testing/tck/tests/SessionCreationEventSpec.groovy |  5 +++++
 .../data/testing/tck/tests/SizeQuerySpec.groovy       |  5 +++++
 .../data/testing/tck/tests/WithTransactionSpec.groovy |  5 +++++
 51 files changed, 234 insertions(+), 12 deletions(-)

diff --git a/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy b/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
index e71e88bd59..1438c0b68e 100644
--- a/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
+++ b/grails-data-hibernate5/core/src/test/groovy/org/apache/grails/data/hibernate5/core/GrailsDataHibernate5TckManager.groovy
@@ -66,13 +66,13 @@ class GrailsDataHibernate5TckManager extends GrailsDataTckManager {
         boolean isTransactional = true
 
         System.setProperty('hibernate5.gorm.suite', "true")
-        grailsApplication = new DefaultGrailsApplication(domainClasses as Class[], new GroovyClassLoader(GrailsDataHibernate5TckManager.getClassLoader()))
+        grailsApplication = new DefaultGrailsApplication(domainClasses, new GroovyClassLoader(GrailsDataHibernate5TckManager.getClassLoader()))
         if (grailsConfig) {
             grailsApplication.config.putAll(grailsConfig)
         }
 
         grailsConfig.dataSource.dbCreate = "create-drop"
-        hibernateDatastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(grailsConfig), domainClasses as Class[])
+        hibernateDatastore = new HibernateDatastore(DatastoreUtils.createPropertyResolver(grailsConfig), domainClasses)
         transactionManager = hibernateDatastore.getTransactionManager()
         sessionFactory = hibernateDatastore.sessionFactory
         if (transactionStatus == null && isTransactional) {
diff --git a/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/GrailsDataMongoTckManager.groovy b/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/GrailsDataMongoTckManager.groovy
index dbf832a927..be76f0d58f 100644
--- a/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/GrailsDataMongoTckManager.groovy
+++ b/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/GrailsDataMongoTckManager.groovy
@@ -90,7 +90,7 @@ class GrailsDataMongoTckManager extends GrailsDataTckManager {
 
     @Override
     Session createSession() {
-        def allClasses = getDomainClasses() as Class[]
+        def allClasses = getDomainClasses()
         def ctx = new GenericApplicationContext()
         ctx.refresh()
 
diff --git a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy
index 4a65234ac4..086f5c791d 100644
--- a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/DeepValidateWithSaveSpec.groovy
@@ -26,6 +26,10 @@ import org.grails.datastore.gorm.validation.CascadingValidator
 
 class DeepValidateWithSaveSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([ChildEntity, TestEntity])
+    }
+
     void "save delegates deepValidate:true to CascadingValidator"() {
         given: "a CascadingValidator mock installed for TestEntity"
         def persistentEntity = manager.session.mappingContext.persistentEntities.find { it.javaClass == TestEntity }
diff --git a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy
index e49cf70fe0..21b40b45f2 100644
--- a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/JpaQueryBuilderSpec.groovy
@@ -30,6 +30,10 @@ import org.springframework.dao.InvalidDataAccessResourceUsageException
  */
 class JpaQueryBuilderSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Person])
+    }
+
     void "Test update query with ilike criterion"() {
         given: "Some criteria"
         DetachedCriteria criteria = new DetachedCriteria(Person).build {
diff --git a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy
index 1ece80ad1d..8844235446 100644
--- a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/ReadOnlyCriteriaSpec.groovy
@@ -25,6 +25,10 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class ReadOnlyCriteriaSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity])
+    }
+
     @Issue('GRAILS-11670')
     void 'Test invoking readOnly in a criteria query'() {
         when:
diff --git a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy
index adfcc4fddb..44bc091507 100644
--- a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SingleResultSpec.groovy
@@ -28,6 +28,10 @@ import spock.lang.Issue
  */
 class SingleResultSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity])
+    }
+
     @Issue('https://github.com/apache/grails-data-mapping/issues/872')
     void "test single result state"() {
         when:
diff --git a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy
index 651de2a4f8..722d443017 100644
--- a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/SubquerySpec.groovy
@@ -29,6 +29,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
  */
 class SubquerySpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Person])
+    }
+
     def "Test subquery with projection and criteria with closure"() {
         given: "A bunch of people"
         createPeople()
diff --git a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy
index d1cf714241..b9ba55ff9d 100644
--- a/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/grails/gorm/tests/WhereMethodSpec.groovy
@@ -43,7 +43,7 @@ class WhereMethodSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
     def gcl
 
     void setupSpec() {
-        List<Class> list = [Continent, Group, Proposal, Advisor]
+        List<Class> list = [Continent, Group, Proposal, Advisor, Country, Face, Nose, Pet, Person]
 
         gcl = new GroovyClassLoader()
         list << gcl.parseClass('''
diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy
index 453aed6269..377903d90a 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/AsyncReadMethodsSpec.groovy
@@ -28,6 +28,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
  */
 class AsyncReadMethodsSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Person])
+    }
+
     def "Test that normal GORM methods can be used within the doAsync method"() {
         given: "Some people"
         final p1 = new Person(firstName: "Homer", lastName: "Simpson").save()
diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy
index 0481921e4c..3547363bcd 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/DistinctProjectionSpec.groovy
@@ -24,6 +24,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 
 class DistinctProjectionSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Person])
+    }
+
     def "Test that using the distinct projection returns distinct results"() {
         given: "Some people with the same last names"
         new Person(firstName: "Homer", lastName: "Simpson").save()
diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy
index 17f6a82aa0..a862940b28 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/NotLikeSpec.groovy
@@ -27,6 +27,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
  */
 class NotLikeSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity])
+    }
+
     void "test not like"() {
         when:
         new TestEntity(name:"Fred").save()
diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy
index 5119602b2d..12c84a4e76 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OneToOneWithProxiesSpec.groovy
@@ -21,6 +21,7 @@ package org.grails.datastore.gorm
 import org.apache.grails.data.testing.tck.domains.Face
 import org.apache.grails.data.testing.tck.domains.Nose
 import org.apache.grails.data.testing.tck.domains.Pet
+import org.apache.grails.data.testing.tck.domains.Person
 import org.apache.grails.data.simple.core.GrailsDataCoreTckManager
 import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 import org.grails.datastore.mapping.proxy.EntityProxy
@@ -30,6 +31,10 @@ import org.grails.datastore.mapping.proxy.EntityProxy
  */
 class OneToOneWithProxiesSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Face, Nose, Pet, Person])
+    }
+
     def "Test persist and retrieve unidirectional many-to-one"() {
         given: "A domain model with a many-to-one"
         def person = new org.apache.grails.data.testing.tck.domains.Person(firstName: "Fred", lastName: "Flintstone")
diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy
index 094fb642c5..3d0303185c 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/OrderBySpec.groovy
@@ -27,6 +27,12 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
  * @author Daniel Wiell
  */
 class OrderBySpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
+
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     def setup() {
         def age = 40
         ["Bob", "Fred", "Barney", "Frank", "Joe", "Ernie"].each {
diff --git a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy
index d9add4e75c..9902aa065f 100644
--- a/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy
+++ b/grails-datamapping-core-test/src/test/groovy/org/grails/datastore/gorm/QueryAssociationSpec.groovy
@@ -20,12 +20,17 @@ package org.grails.datastore.gorm
 
 import org.apache.grails.data.testing.tck.domains.ChildEntity
 import org.apache.grails.data.testing.tck.domains.PlantCategory
+import org.apache.grails.data.testing.tck.domains.Plant
 import org.apache.grails.data.testing.tck.domains.TestEntity
 import org.apache.grails.data.simple.core.GrailsDataCoreTckManager
 import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 
 class QueryAssociationSpec extends GrailsDataTckSpec<GrailsDataCoreTckManager> {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([ChildEntity, PlantCategory, Plant, TestEntity])
+    }
+
     void "Test query one-to-one association with disjunction"() {
         given:
         new TestEntity(name: "Bob", age: 44, child: new ChildEntity(name: "Nick")).save(flush: true)
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 14dcb67d27..ed588fa89e 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
@@ -45,6 +45,7 @@ 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.gorm.services.transform.ServiceTransformation
 import org.grails.datastore.mapping.core.DatastoreUtils
 import org.grails.datastore.mapping.core.Session
 
@@ -56,15 +57,15 @@ abstract class GrailsDataTckManager {
 
     abstract Session createSession()
 
-    private List<Class> domainClasses = [
+    private Set<Class> domainClasses = [
     ]
 
     /**
-     * Returns an unmodifiable view of the domain classes list.
-     * @return An unmodifiable list of domain classes
+     * Returns a defensive copy of the registered domain classes.
+     * Mutating this array will not affect the manager state.
      */
-    List<Class> getDomainClasses() {
-        return Collections.unmodifiableList(domainClasses)
+    Class[] getDomainClasses() {
+        return domainClasses as Class[]
     }
 
     /**
@@ -72,7 +73,13 @@ abstract class GrailsDataTckManager {
      * @param classes The classes to add
      */
     void addAllDomainClasses(Collection<Class> classes) {
-        domainClasses.addAll(classes)
+       registerDomainClasses(classes as Class[])
+    }
+
+    void registerDomainClasses(Class... classes) {
+        if (classes) {
+            domainClasses.addAll(classes)
+        }
     }
 
     void setupSpec() {
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 dfdd093119..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
@@ -26,6 +26,10 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class AttachMethodSpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Person])
+    }
+
     void 'Test attach method'() {
         given:
         def test = new Person(firstName: 'Bob', lastName: 'Builder').save()
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 bcc2149bb7..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
@@ -26,6 +26,10 @@ import org.apache.grails.data.testing.tck.domains.Task
  */
 class CircularOneToManySpec extends GrailsDataTckSpec {
 
+    void setupSpec() {
+        manager.addAllDomainClasses([Task])
+    }
+
     void 'Test circular one-to-many'() {
         given:
         def parent = new Task(name: 'Root').save()
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..aec6f9dc79 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,10 @@ 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..7f9b52a01c 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class CriteriaBuilderSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     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..84073ac0d2 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class CrudOperationsSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     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..b291bb5450 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class DeleteAllSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..807bd37942 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class DetachedCriteriaSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..4f7c248e21 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,11 @@ import org.apache.grails.data.testing.tck.domains.PersonEvent
  */
 class DomainEventsSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([PersonEvent, ModifyPerson])
+    }
+
     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..c7c3d188c4 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEnum
 
 class EnumSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([EnumThing])
+    }
+
     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..680fc3b68b 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,11 @@ import org.apache.grails.data.testing.tck.domains.Plant
 
 class FindByExampleSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..75f2f91ac1 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class FindByMethodSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..2919d6ea38 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class FindOrCreateWhereSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..1095721d67 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class FindOrSaveWhereSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..e3adbdb295 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class FindWhereSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..894f6f309c 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class GormEnhancerSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     void 'Test basic CRUD operations'() {
         given:
         def t
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..de013d7c54 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,11 @@ import org.grails.datastore.gorm.proxy.GroovyProxyFactory
 // this test is ignored because Groovy proxies are not used with Hibernate
 class GroovyProxySpec extends GrailsDataTckSpec {
 
+    @Override
+    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..4174707903 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class ListOrderBySpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     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..50d133c2a0 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,11 @@ import org.apache.grails.data.testing.tck.domains.Book
  */
 class NegationSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..9628e35a67 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class NotInListSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..71800511ef 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
 
 class NullValueEqualSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..2c4247f842 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,11 @@ import org.apache.grails.data.testing.tck.domains.PetType
  */
 class OneToManySpec extends GrailsDataTckSpec {
 
+    @Override
+    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..64736818df 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,11 @@ import org.grails.datastore.mapping.model.types.OneToOne
 
 class OneToOneSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..977fd5934e 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,11 @@ import org.grails.datastore.mapping.core.OptimisticLockingException
  */
 class OptimisticLockingSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([OptLockVersioned, OptLockNotVersioned])
+    }
+
     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..840f95ab04 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class OrderBySpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     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..c28e02182d 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class PagedResultSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..b199987bef 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class ProxyLoadingSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     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..2c7cf1672a 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class QueryAfterPropertyChangeSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..06e6e4f4f3 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class QueryByAssociationSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     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..76976dc556 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class QueryByNullSpec extends GrailsDataTckSpec {
 
+    @Override
+    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/QueryEventsSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryEventsSpec.groovy
index ff7135d7ac..abaddf82f1 100644
--- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryEventsSpec.groovy
+++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/QueryEventsSpec.groovy
@@ -41,7 +41,7 @@ class QueryEventsSpec extends GrailsDataTckSpec {
     SpecQueryEventListener listener
 
     void setupSpec() {
-        manager.addAllDomainClasses([Simples])
+        manager.addAllDomainClasses([TestEntity])
     }
 
     def setup() {
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..6f2dc87d9c 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class RangeQuerySpec extends GrailsDataTckSpec {
 
+    @Override
+    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..24ede3502e 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
 
 class SaveAllSpec extends GrailsDataTckSpec {
 
+    @Override
+    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..496b7d56b7 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,11 @@ 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 {
 
+    @Override
+    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..793eb224b7 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,11 @@ import org.apache.grails.data.testing.tck.domains.Person
  */
 class SizeQuerySpec extends GrailsDataTckSpec {
 
+    @Override
+    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..bbad555147 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,11 @@ import org.apache.grails.data.testing.tck.domains.TestEntity
  */
 class WithTransactionSpec extends GrailsDataTckSpec {
 
+    @Override
+    void setupSpec() {
+        manager.addAllDomainClasses([TestEntity, ChildEntity])
+    }
+
     void 'Test save() with transaction'() {
         given:
         TestEntity.withTransaction {