This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch merge-hibernate6 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 3cfa411a2330304318946cdd421993541a4a83f8 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Jun 7 22:48:10 2025 -0500 Making tests more specific to the domain classes tested --- .../hibernate/query/AbstractHibernateQuery.java | 3 +- .../orm/hibernate/query/PredicateGenerator.java | 41 +++++++++++++++++- .../CompositeIdWithManyToOneAndSequenceSpec.groovy | 18 +++----- .../gorm/specs/HibernateGormDatastoreSpec.groovy | 1 + .../specs/MultiColumnUniqueConstraintSpec.groovy | 1 + .../grails/gorm/specs/OptimisticLockingSpec.groovy | 6 ++- .../specs/hibernatequery/HibernateQuerySpec.groovy | 46 +++++++++++--------- .../testing/tck/base/GrailsDataTckManager.groovy | 50 +++++++++++----------- .../data/testing/tck/tests/AttachMethodSpec.groovy | 3 ++ .../testing/tck/tests/CircularOneToManySpec.groovy | 4 ++ .../tck/tests/CommonTypesPersistenceSpec.groovy | 3 ++ .../testing/tck/tests/CriteriaBuilderSpec.groovy | 5 +++ .../testing/tck/tests/CrudOperationsSpec.groovy | 4 ++ .../data/testing/tck/tests/DeleteAllSpec.groovy | 4 ++ .../testing/tck/tests/DetachedCriteriaSpec.groovy | 4 ++ .../data/testing/tck/tests/DomainEventsSpec.groovy | 4 ++ .../grails/data/testing/tck/tests/EnumSpec.groovy | 4 ++ .../testing/tck/tests/FindByExampleSpec.groovy | 4 ++ .../data/testing/tck/tests/FindByMethodSpec.groovy | 6 ++- .../testing/tck/tests/FindOrCreateWhereSpec.groovy | 4 ++ .../testing/tck/tests/FindOrSaveWhereSpec.groovy | 4 ++ .../data/testing/tck/tests/FindWhereSpec.groovy | 4 ++ .../data/testing/tck/tests/GormEnhancerSpec.groovy | 4 ++ .../testing/tck/tests/GormValidateableSpec.groovy | 4 ++ .../data/testing/tck/tests/GroovyProxySpec.groovy | 4 ++ .../data/testing/tck/tests/ListOrderBySpec.groovy | 4 ++ .../data/testing/tck/tests/NamedQuerySpec.groovy | 4 ++ .../data/testing/tck/tests/NegationSpec.groovy | 5 +++ .../data/testing/tck/tests/NotInListSpec.groovy | 4 ++ .../testing/tck/tests/NullValueEqualSpec.groovy | 4 ++ .../data/testing/tck/tests/OneToManySpec.groovy | 4 ++ .../data/testing/tck/tests/OneToOneSpec.groovy | 4 ++ .../testing/tck/tests/OptimisticLockingSpec.groovy | 4 ++ .../data/testing/tck/tests/OrderBySpec.groovy | 4 ++ .../data/testing/tck/tests/PagedResultSpec.groovy | 4 ++ .../data/testing/tck/tests/ProxyLoadingSpec.groovy | 4 ++ .../tck/tests/QueryAfterPropertyChangeSpec.groovy | 4 ++ .../tck/tests/QueryByAssociationSpec.groovy | 4 ++ .../data/testing/tck/tests/QueryByNullSpec.groovy | 4 ++ .../data/testing/tck/tests/QueryEventsSpec.groovy | 3 +- .../data/testing/tck/tests/RangeQuerySpec.groovy | 4 ++ .../data/testing/tck/tests/SaveAllSpec.groovy | 4 ++ .../tck/tests/SessionCreationEventSpec.groovy | 1 + .../data/testing/tck/tests/SizeQuerySpec.groovy | 4 ++ .../testing/tck/tests/WithTransactionSpec.groovy | 4 ++ 45 files changed, 245 insertions(+), 67 deletions(-) diff --git a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java index d18807919c..9dec245ed8 100644 --- a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java +++ b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/AbstractHibernateQuery.java @@ -431,7 +431,8 @@ public abstract class AbstractHibernateQuery extends Query { org.hibernate.query.Query query = createQuery(); try { - return proxyHandler.unwrap(query.getSingleResult()); + Object singleResult = query.getSingleResult(); + return proxyHandler.unwrap(singleResult); } catch (NonUniqueResultException e) { return proxyHandler.unwrap(query.getResultList().get(0)); diff --git a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java index a6889f98bf..5bb4a180fc 100644 --- a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java +++ b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/PredicateGenerator.java @@ -42,7 +42,7 @@ public class PredicateGenerator { List<Predicate> list = criteriaList.stream(). map(criterion -> { - if (criterion instanceof Query.Disjunction) { + if (criterion instanceof Query.Disjunction) { List<Query.Criterion> criterionList = ((Query.Disjunction) criterion).getCriteria(); return cb.or(getPredicates(cb, criteriaQuery, root_, criterionList, tablesByName)); } else if (criterion instanceof Query.DistinctProjection) { @@ -135,7 +135,8 @@ public class PredicateGenerator { return cb.lt(cb.size(getFullyQualifiedPath(tablesByName, c.getProperty())), (Number) c.getValue()); } else if (criterion instanceof Query.SizeLessThanEquals c) { return cb.le(cb.size(getFullyQualifiedPath(tablesByName, c.getProperty())), (Number) c.getValue()); - } else if (criterion instanceof Query.In c + } else if ( + criterion instanceof Query.In c && Objects.nonNull(c.getSubquery()) && !c.getSubquery().getProjections().isEmpty() && c.getSubquery().getProjections().get(0) instanceof Query.PropertyProjection @@ -152,6 +153,24 @@ public class PredicateGenerator { Predicate[] predicates = getPredicates(cb, criteriaQuery, from, subCriteria, newMap); subquery.select(getFullyQualifiedPath(newMap,projection.getPropertyName())).distinct(distinct).where(cb.and(predicates)); return in.value(subquery); + } else if ( + criterion instanceof Query.NotIn c + && Objects.nonNull(c.getSubquery()) + && !c.getSubquery().getProjections().isEmpty() + && c.getSubquery().getProjections().get(0) instanceof Query.PropertyProjection + ) { + JpaInPredicate in = cb.in(root_.get(c.getProperty())); + Query.PropertyProjection projection = (Query.PropertyProjection) c.getSubquery().getProjections().get(0); + boolean distinct = projection instanceof Query.DistinctPropertyProjection; + Subquery subquery = criteriaQuery.subquery(getJavaTypeOfInClause((SqmInListPredicate) in)); + Root from = subquery.from(c.getSubquery().getPersistentEntity().getJavaClass()); + List subCriteria = c.getSubquery().getCriteria(); + Map<String,From> newMap = new HashMap<>(); + newMap.putAll(tablesByName); + newMap.put("root", from); + Predicate[] predicates = getPredicates(cb, criteriaQuery, from, subCriteria, newMap); + subquery.select(getFullyQualifiedPath(newMap,projection.getPropertyName())).distinct(distinct).where(cb.and(predicates)); + return cb.not(in.value(subquery)); } else if (criterion instanceof Query.In c && Objects.nonNull(c.getSubquery()) && !c.getSubquery().getProjections().isEmpty() @@ -167,9 +186,27 @@ public class PredicateGenerator { Predicate[] predicates = getPredicates(cb, criteriaQuery, from, subCriteria, newMap); subquery.select(from).where(cb.and(predicates)); return in.value(subquery); + } else if (criterion instanceof Query.NotIn c + && Objects.nonNull(c.getSubquery()) + && !c.getSubquery().getProjections().isEmpty() + && c.getSubquery().getProjections().get(0) instanceof Query.IdProjection + ) { + JpaInPredicate in = cb.in(root_.get("id")); + Subquery subquery = criteriaQuery.subquery(getJavaTypeOfInClause((SqmInListPredicate) in)); + Root from = subquery.from(c.getSubquery().getPersistentEntity().getJavaClass()); + List subCriteria = c.getSubquery().getCriteria(); + Map<String,From> newMap = new HashMap<>(); + newMap.putAll(tablesByName); + newMap.put("root", from); + Predicate[] predicates = getPredicates(cb, criteriaQuery, from, subCriteria, newMap); + subquery.select(from).where(cb.and(predicates)); + return cb.not(in.value(subquery)); } else if (criterion instanceof Query.In c && !c.getValues().isEmpty() ) { return cb.in(getFullyQualifiedPath(tablesByName, c.getProperty()), c.getValues()); + } else if (criterion instanceof Query.NotIn c + ) { + return cb.not(cb.in(getFullyQualifiedPath(tablesByName, c.getProperty()), c.getValue())); } else if (criterion instanceof Query.Exists c) { Subquery subquery = criteriaQuery.subquery(Object.class); Root subRoot = subquery.from(c.getSubquery().getPersistentEntity().getJavaClass()); diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/CompositeIdWithManyToOneAndSequenceSpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/CompositeIdWithManyToOneAndSequenceSpec.groovy index bb39f16f53..9a3dc528c8 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/CompositeIdWithManyToOneAndSequenceSpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/CompositeIdWithManyToOneAndSequenceSpec.groovy @@ -39,14 +39,11 @@ class CompositeIdWithManyToOneAndSequenceSpec extends HibernateGormDatastoreSpec @Issue('https://github.com/grails/grails-data-mapping/issues/835') void "Test composite id many to one and sequence"() { - when: "a many to one association is created" + when:"a many to one association is created" ToothDisease td = new ToothDisease(nrVersion: 1).save() + new Tooth(toothDisease: td).save(flush:true) - def tooth = new Tooth() - tooth.toothDisease << td - tooth.save(flush: true) - - then: "The object was saved" + then:"The object was saved" Tooth.count() == 1 Tooth.list().first().toothDisease != null } @@ -57,7 +54,7 @@ class CompositeIdWithManyToOneAndSequenceSpec extends HibernateGormDatastoreSpec @Entity class Tooth { Integer id - SortedSet<ToothDisease> toothDisease + ToothDisease toothDisease static mapping = { table name: 'AK_TOOTH' id generator: 'sequence', params: [sequence: 'SEQ_AK_TOOTH'] @@ -69,7 +66,7 @@ class Tooth { } @Entity -class ToothDisease implements Serializable, Comparable<ToothDisease> { +class ToothDisease implements Serializable { Integer idColumn Integer nrVersion static mapping = { @@ -78,9 +75,4 @@ class ToothDisease implements Serializable, Comparable<ToothDisease> { nrVersion column: 'NR_VERSION' id composite: ['idColumn', 'nrVersion'] } - - @Override - int compareTo(@Nonnull ToothDisease o) { - return idColumn <=> ((ToothDisease) o).idColumn - } } \ No newline at end of file diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy index a1abe33517..3e2f96eb19 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/HibernateGormDatastoreSpec.groovy @@ -29,5 +29,6 @@ class HibernateGormDatastoreSpec extends GrailsDataTckSpec<GrailsDataHibernate6T 'hibernate.hbm2ddl.auto' : 'create', 'hibernate.jpa.compliance.cascade': 'true', ] + manager.domainClasses.clear() } } diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/MultiColumnUniqueConstraintSpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/MultiColumnUniqueConstraintSpec.groovy index d804f926a0..33302caee7 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/MultiColumnUniqueConstraintSpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/MultiColumnUniqueConstraintSpec.groovy @@ -27,6 +27,7 @@ import spock.lang.Issue @Issue('https://github.com/grails/grails-data-mapping/issues/617') class MultiColumnUniqueConstraintSpec extends GrailsDataTckSpec<GrailsDataHibernate6TckManager> { void setupSpec() { + manager.domainClasses.clear() manager.domainClasses.addAll([DomainOne, Task1, TaskLink]) } diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/OptimisticLockingSpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/OptimisticLockingSpec.groovy index c9b2a4440c..dcb889cbfd 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/OptimisticLockingSpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/OptimisticLockingSpec.groovy @@ -27,7 +27,11 @@ import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureExcep /** * @author Burt Beckwith */ -class OptimisticLockingSpec extends GrailsDataTckSpec<GrailsDataHibernate6TckManager> { +class OptimisticLockingSpec extends HibernateGormDatastoreSpec { + + def setupSpec() { + manager.domainClasses.addAll([OptLockVersioned, OptLockNotVersioned]) + } void "Test versioning"() { given: diff --git a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy index 3fe349cff2..539b8d46cc 100644 --- a/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy +++ b/grails-data-hibernate6/core/src/test/groovy/grails/gorm/specs/hibernatequery/HibernateQuerySpec.groovy @@ -31,7 +31,8 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec { } def setupSpec() { - manager.domainClasses.addAll([Person, Pet, EagerOwner]) + manager.domainClasses.clear() + manager.domainClasses.addAll([Person, Pet, Face, EagerOwner]) } def equals() { @@ -301,30 +302,29 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec { def inSubQuery() { given: new Person(firstName: "Fred", lastName: "Rogers", age: 52).save(flush: true) - def oldPet = new Pet(name: "Lucky") - oldBob.addToPets(oldPet) - oldBob.save(flush: true) - petHibernateQuery.in("owner", - new DetachedCriteria(Person).eq("lastName", "Builder") + hibernateQuery.in("firstName", + new DetachedCriteria(Person) + .eq("lastName", "Builder") + .property("firstName") ) when: - def newPet = petHibernateQuery.singleResult() + def newBob = hibernateQuery.singleResult() then: - oldPet == newPet + oldBob == newBob } def notInSubQuery() { given: - def oldPet = new Pet(name: "Lucky") - oldBob.addToPets(oldPet) - oldBob.save(flush: true) - DetachedCriteria detachedCriteria = new DetachedCriteria(Person) - detachedCriteria.eq("owner.lastName", "Rogers") - petHibernateQuery.join("owner").notIn("owner", detachedCriteria) + new Person(firstName: "Fred", lastName: "Rogers", age: 52).save(flush: true) + hibernateQuery.notIn("firstName", + new DetachedCriteria(Person) + .eq("lastName", "Rogers") + .property("firstName") + ) when: - def newPet = petHibernateQuery.singleResult() + def newBob = hibernateQuery.singleResult() then: - oldPet == newPet + oldBob == newBob } // @Ignore("Exits subquery is broken") @@ -353,14 +353,18 @@ class HibernateQuerySpec extends HibernateGormDatastoreSpec { */ def exists() { given: - def fred = new Person(firstName: "Fred", lastName: "Rogers", age: 52).save(flush: true) + new Person(firstName: "Fred", lastName: "Rogers", age: 52).save(flush: true) new Pet(name: "Lucky", owner: oldBob).save(flush:true) - petHibernateQuery.singleResult() - hibernateQuery.exists(new DetachedCriteria(Pet).eq("owner", oldBob)) + def one = Person.findAll() + def two = Pet.findAll() + hibernateQuery.exists( + new DetachedCriteria(Pet).property("name").eq("owner", oldBob) + ) when: - def newBob = hibernateQuery.singleResult() + def list = hibernateQuery.list() then: - oldBob == newBob + list.size() == 1 + oldBob == list.get(0) } /** 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 e41d28112e..561d35a02c 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 @@ -55,31 +55,31 @@ abstract class GrailsDataTckManager { abstract Session createSession() List<Class> domainClasses = [ - Book, - ChildEntity, - City, - ClassWithListArgBeforeValidate, - ClassWithNoArgBeforeValidate, - ClassWithOverloadedBeforeValidate, - CommonTypes, - Country, - EnumThing, - Face, - Highway, - Location, - ModifyPerson, - Nose, - OptLockNotVersioned, - OptLockVersioned, - Person, - PersonEvent, - Pet, - PetType, - Plant, - PlantCategory, - Publication, - Task, - TestEntity +// Book, +// ChildEntity, +// City, +// ClassWithListArgBeforeValidate, +// ClassWithNoArgBeforeValidate, +// ClassWithOverloadedBeforeValidate, +// CommonTypes, +// Country, +// EnumThing, +// Face, +// Highway, +// Location, +// ModifyPerson, +// Nose, +// OptLockNotVersioned, +// OptLockVersioned, +// Person, +// PersonEvent, +// Pet, +// PetType, +// Plant, +// PlantCategory, +// Publication, +// Task, +// TestEntity ] 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 7d28106d03..0530fc6537 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 @@ -25,6 +25,9 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec * @author graemerocher */ class AttachMethodSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.add(Person) + } void "Test attach method"() { given: 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 71cc492179..fac928f18b 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.base.GrailsDataTckSpec */ class CircularOneToManySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.add(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 8086b73284..34dcf1f08b 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 @@ -25,6 +25,9 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec * @author graemerocher */ class CommonTypesPersistenceSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.add(CommonTypes) + } def testPersistBasicTypes() { given: 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 ba644aab53..e936a1f7bc 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 @@ -19,6 +19,7 @@ package org.apache.grails.data.testing.tck.tests import org.apache.grails.data.testing.tck.domains.ChildEntity +import org.apache.grails.data.testing.tck.domains.Task import org.apache.grails.data.testing.tck.domains.TestEntity import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec @@ -27,6 +28,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class CriteriaBuilderSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([TestEntity, ChildEntity, Task]) + } + 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 c9f4862ee0..1d0cedd5a9 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 @@ -29,6 +29,10 @@ import spock.lang.IgnoreRest */ class CrudOperationsSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 4b45c8e95b..da54146c73 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class DeleteAllSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 10f05931cc..f1e8a1ccfd 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class DetachedCriteriaSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 585b5437e7..d655c7c47a 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 @@ -30,6 +30,10 @@ import spock.lang.PendingFeature */ class DomainEventsSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 529b165598..0a8d1f0fbe 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 @@ -25,6 +25,10 @@ import spock.lang.Issue class EnumSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 ca798be055..e4045fed2f 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class FindByExampleSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 cd606f57a5..e6161c33c9 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class FindByMethodSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([Person, Book, Highway]) + } + void 'Test Using AND Multiple Times In A Dynamic Finder'() { given: new Person(firstName: 'Jake', lastName: 'Brown', age: 11).save() @@ -450,5 +454,3 @@ class FindByMethodSpec extends GrailsDataTckSpec { // thrown MissingMethodException } } - - 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 566dbb10bd..720fe105ec 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class FindOrCreateWhereSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 f38c5cb19f..3514fd00d4 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class FindOrSaveWhereSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 9afd63f601..d1b07e7945 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class FindWhereSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 4487dc69f1..53a20c4e9d 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class GormEnhancerSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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/GormValidateableSpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/GormValidateableSpec.groovy index a0fd2b895a..a0842d0718 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,10 @@ import org.grails.datastore.gorm.GormValidateable class GormValidateableSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 e58ffbe31f..a573d1fe10 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 @@ -31,6 +31,10 @@ import spock.lang.IgnoreIf // this test is ignored because Groovy proxies are not used with Hibernate class GroovyProxySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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/ListOrderBySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/ListOrderBySpec.groovy index 1fdc43a4d0..fb9b484975 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class ListOrderBySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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/NamedQuerySpec.groovy b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NamedQuerySpec.groovy index 71382237b5..8665b866b0 100644 --- a/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NamedQuerySpec.groovy +++ b/grails-datamapping-tck/src/main/groovy/org/apache/grails/data/testing/tck/tests/NamedQuerySpec.groovy @@ -28,6 +28,10 @@ import spock.lang.PendingFeature */ class NamedQuerySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([Publication, PlantCategory]) + } + void "Test Named Query Passing Multiple Params To Nested Named Query"() { given: def now = new Date() 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 cbeca79874..589ddc16e1 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.base.GrailsDataTckSpec */ class NegationSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 c8f0777c3b..604e427761 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class NotInListSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 cf4135040e..e8acb06446 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 @@ -24,6 +24,10 @@ import spock.lang.IgnoreIf class NullValueEqualSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 286dd07d3d..5c5e58801a 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class OneToManySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 2017d3b684..48dcf33d16 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,10 @@ import org.grails.datastore.mapping.model.types.OneToOne class OneToOneSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 3e2eec1cab..07de22f9ba 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 @@ -29,6 +29,10 @@ import spock.lang.IgnoreIf */ class OptimisticLockingSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 f4a84bdbb7..d809b9ac1f 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class OrderBySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 6de8288982..b5df039a4d 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class PagedResultSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 92682ae72b..8afebe631b 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class ProxyLoadingSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 bf46c24e46..62372b9610 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class QueryAfterPropertyChangeSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 34c13c5b36..6e4f09a4d6 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class QueryByAssociationSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 5774e7f551..4c9909dfb7 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class QueryByNullSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 2b3e8deb55..2ae74ee390 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 @@ -40,7 +40,7 @@ class QueryEventsSpec extends GrailsDataTckSpec { SpecQueryEventListener listener void setupSpec() { - manager.domainClasses.addAll([Simples]) + manager.domainClasses.addAll([Simples, TestEntity]) } def setup() { @@ -127,4 +127,3 @@ class QueryEventsSpec extends GrailsDataTckSpec { } } } - 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 5659cc0d02..9eca62cdda 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 @@ -30,6 +30,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class RangeQuerySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([Publication, TestEntity, Person, ChildEntity]) + } + 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 453c5dc519..2b2fc6d9bb 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,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec class SaveAllSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([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 2a019620dc..eb393d0206 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 @@ -39,6 +39,7 @@ class SessionCreationEventSpec extends GrailsDataTckSpec { def setup() { listener = new Listener() manager.session.datastore.applicationContext.addApplicationListener(listener) + manager.domainClasses.addAll([TestEntity]) } void "test event for new session"() { 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 5ee979fe09..7902e04498 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 @@ -26,6 +26,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec * Tests for querying the size of collections etc. */ class SizeQuerySpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([Country, Person]) + } + void "Test sizeLe criterion"() { given: "A country with only 1 resident" 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 0616c3b0e7..e5abeb64ab 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 @@ -28,6 +28,10 @@ import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec */ class WithTransactionSpec extends GrailsDataTckSpec { + void setupSpec() { + manager.domainClasses.addAll([TestEntity, ChildEntity]) + } + void "Test save() with transaction"() { given: TestEntity.withTransaction {
