From 7ecd859a09ee952612a0987f798d0bd88edda4b9 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Wed, 27 May 2026 21:33:09 -0400 Subject: [PATCH 1/2] Introduce MongoDatastoreSpec base class for mongo TCK specs Two coordinated changes that together reduce noise in every mongo TCK spec by hiding the generic-parameter scaffolding behind a small base class: 1. Rename the mongo test tree from `grails.gorm.tests` to `grails.gorm.specs` to match the convention being adopted across the data-mapping test suite. Includes the mongo-local domain classes (Plant, Pet, Face, Nose, Person) and three mongo-local specs (DirtyCheckEmbeddedCollectionSpec, FindNativeSpec, listener/PersistenceEventListenerSpec). Updates 18 non-renamed mongo specs to import the new package paths. 2. Add a thin abstract base class: abstract class MongoDatastoreSpec extends GrailsDataTckSpec { } and refactor ~107 mongo specs to extend `MongoDatastoreSpec` instead of repeating `GrailsDataTckSpec` at every declaration site. The two changes are committed together because the rename is a prerequisite for the base class - `MongoDatastoreSpec` lives at the new `grails.gorm.specs`-adjacent location and assumes the surrounding mongo specs reference the renamed packages. This change was originally pulled forward into the hibernate7 staging branch as commits 01c27f9a77 (mongo portion only) and c8cb43f2ec on PR #15654. @sbglasius questioned whether the refactor belonged in that PR. Extracting it here so it can land on 8.0.x on its own merits as a prerequisite for the Hibernate 7 work. Once merged here, the corresponding portion of "Pull forward package changes" and the whole "Pull forward base tck test" commit on the hibernate7 staging branch should be removed since they will arrive through the next merge of 8.0.x. Assisted-by: claude-code:claude-4.7-opus --- .../DirtyCheckEmbeddedCollectionSpec.groovy | 9 +++---- .../grails/gorm/{tests => specs}/Face.groovy | 2 +- .../{tests => specs}/FindNativeSpec.groovy | 8 +++---- .../grails/gorm/{tests => specs}/Nose.groovy | 2 +- .../gorm/{tests => specs}/Person.groovy | 2 +- .../grails/gorm/{tests => specs}/Pet.groovy | 2 +- .../grails/gorm/{tests => specs}/Plant.groovy | 2 +- .../PersistenceEventListenerSpec.groovy | 8 +++---- .../bootstrap/FailOnErrorSetupSpec.groovy | 3 +-- .../mongodb/cascade/MongoCascadeSpec.groovy | 5 ++-- .../data/mongo/core/MongoDatastoreSpec.groovy | 24 +++++++++++++++++++ .../gorm/mongo/AggregateMethodSpec.groovy | 5 ++-- .../gorm/mongo/AssignedIdentifierSpec.groovy | 5 ++-- .../gorm/mongo/AutowireServicesSpec.groovy | 5 ++-- .../gorm/mongo/BasicArraySpec.groovy | 5 ++-- .../gorm/mongo/BasicCollectionTypeSpec.groovy | 5 ++-- .../gorm/mongo/BasicCollectionsSpec.groovy | 5 ++-- .../gorm/mongo/BatchUpdateDeleteSpec.groovy | 8 +++---- .../gorm/mongo/BeforeInsertUpdateSpec.groovy | 5 ++-- ...BeforeUpdatePropertyPersistenceSpec.groovy | 5 ++-- .../gorm/mongo/BigDecimalSpec.groovy | 5 ++-- .../BrokenManyToManyAssociationSpec.groovy | 5 ++-- .../mongo/CascadeDeleteOneToOneSpec.groovy | 5 ++-- .../gorm/mongo/CascadeDeleteSpec.groovy | 5 ++-- .../CircularBidirectionalOneToManySpec.groovy | 5 ++-- .../mongo/CircularEmbeddedListSpec.groovy | 5 ++-- .../gorm/mongo/CircularOneToManySpec.groovy | 5 ++-- .../gorm/mongo/ClearCollectionSpec.groovy | 5 ++-- ...omCollectionAndAttributeMappingSpec.groovy | 5 ++-- .../gorm/mongo/CustomIdProxySpec.groovy | 5 ++-- .../mongo/CustomMongoEventListenerSpec.groovy | 5 ++-- .../mongo/CustomTypeMarshallingSpec.groovy | 5 ++-- .../gorm/mongo/DBObjectConversionSpec.groovy | 5 ++-- .../gorm/mongo/DbRefWithEmbeddedSpec.groovy | 5 ++-- .../gorm/mongo/DefaultSortOrderSpec.groovy | 5 ++-- .../gorm/mongo/DirtyCheckUpdateSpec.groovy | 5 ++-- .../gorm/mongo/DisableVersionSpec.groovy | 5 ++-- .../gorm/mongo/DisjunctionQuerySpec.groovy | 11 +++++---- .../gorm/mongo/DistinctPropertySpec.groovy | 5 ++-- .../gorm/mongo/DocumentMappingSpec.groovy | 5 ++-- .../gorm/mongo/EmbeddedAssociationSpec.groovy | 5 ++-- .../mongo/EmbeddedBiDirectionalSpec.groovy | 5 ++-- ...mbeddedCollectionAndInheritanceSpec.groovy | 5 ++-- .../mongo/EmbeddedCollectionWithIdSpec.groovy | 5 ++-- .../EmbeddedCollectionWithOneToOneSpec.groovy | 5 ++-- ...EmbeddedHasManyWithBeforeUpdateSpec.groovy | 7 +++--- .../EmbeddedListWithCustomTypeSpec.groovy | 5 ++-- .../gorm/mongo/EmbeddedMapSpec.groovy | 5 ++-- .../mongo/EmbeddedSetAssignedIdSpec.groovy | 5 ++-- .../mongo/EmbeddedSimpleObjectSpec.groovy | 5 ++-- ...ingListInsideEmbeddedCollectionSpec.groovy | 5 ++-- .../gorm/mongo/EmbeddedUnsetSpec.groovy | 5 ++-- .../gorm/mongo/EmbeddedWhereClauseSpec.groovy | 5 ++-- .../EmbeddedWithCustomFieldMappingSpec.groovy | 5 ++-- .../mongo/EmbeddedWithIdSpecifiedSpec.groovy | 7 +++--- ...ddedWithNonEmbeddedAssociationsSpec.groovy | 5 ++-- ...eddedWithNonEmbeddedCollectionsSpec.groovy | 5 ++-- ...beddedWithinEmbeddedAssociationSpec.groovy | 5 ++-- .../gorm/mongo/EnumCollectionSpec.groovy | 5 ++-- .../datastore/gorm/mongo/EnumTypeSpec.groovy | 5 ++-- .../EventsWithAbstractInheritanceSpec.groovy | 5 ++-- .../gorm/mongo/FindOrCreateWhereSpec.groovy | 8 +++---- .../mongo/GeoJSONTypePersistenceSpec.groovy | 5 ++-- .../gorm/mongo/GeospacialQuerySpec.groovy | 5 ++-- .../datastore/gorm/mongo/GetAllSpec.groovy | 12 +++++----- .../gorm/mongo/GetAllWithStringIdSpec.groovy | 5 ++-- .../GreaterThanAndLessThanCriteriaSpec.groovy | 5 ++-- .../datastore/gorm/mongo/HasOneSpec.groovy | 5 ++-- .../gorm/mongo/HintQueryArgumentSpec.groovy | 10 ++++---- .../gorm/mongo/InListQuerySpec.groovy | 13 +++++----- .../IndexAttributesAndCompoundKeySpec.groovy | 5 ++-- .../mongo/IndexWithInheritanceSpec.groovy | 5 ++-- .../gorm/mongo/InheritanceQueryingSpec.groovy | 5 ++-- ...tanceWithSingleEndedAssociationSpec.groovy | 5 ++-- .../datastore/gorm/mongo/InnerEnumSpec.groovy | 5 ++-- .../datastore/gorm/mongo/IsNullSpec.groovy | 5 ++-- .../gorm/mongo/JakartaValidationSpec.groovy | 5 ++-- .../gorm/mongo/LastUpdatedSpec.groovy | 5 ++-- .../datastore/gorm/mongo/LikeQuerySpec.groovy | 10 ++++---- .../mongo/ListOneToManyOrderingSpec.groovy | 5 ++-- .../gorm/mongo/MapOfDomainsSpec.groovy | 5 ++-- .../gorm/mongo/MarkDirtyFalseSpec.groovy | 5 ++-- .../MongoDynamicPropertyOnEmbeddedSpec.groovy | 5 ++-- .../gorm/mongo/MongoEntityConfigSpec.groovy | 5 ++-- .../gorm/mongo/MongoGormEnhancerSpec.groovy | 5 ++-- .../mongo/MongoResultsListIndexSpec.groovy | 10 ++++---- .../gorm/mongo/MongoTypesSpec.groovy | 5 ++-- .../gorm/mongo/NegateInListSpec.groovy | 10 ++++---- .../gorm/mongo/NegationEnumSpec.groovy | 5 ++-- .../gorm/mongo/NullifyPropertySpec.groovy | 12 +++++----- .../gorm/mongo/NullsAreNotStoredSpec.groovy | 5 ++-- .../gorm/mongo/ObjectIdPersistenceSpec.groovy | 5 ++-- .../gorm/mongo/ObjectIdPropertySpec.groovy | 5 ++-- .../mongo/OneToManyWithInheritanceSpec.groovy | 5 ++-- .../gorm/mongo/OneToOneIntegritySpec.groovy | 17 ++++++------- .../gorm/mongo/OneToOneNoReferenceSpec.groovy | 5 ++-- .../OptimisticLockingWithExceptionSpec.groovy | 5 ++-- .../gorm/mongo/OrderWithPaginationSpec.groovy | 11 +++++---- .../gorm/mongo/ProjectionsSpec.groovy | 5 ++-- ...ueriesWithIdenticallyNamedPartsSpec.groovy | 5 ++-- .../gorm/mongo/ReadConcernArgumentSpec.groovy | 20 ++++++++-------- .../gorm/mongo/ReadManyObjectsSpec.groovy | 5 ++-- ...ultsWithGroovyCollectionMethodsSpec.groovy | 11 +++++---- .../gorm/mongo/SchemalessSpec.groovy | 10 ++++---- .../gorm/mongo/SessionCachingSpec.groovy | 10 ++++---- .../gorm/mongo/SetRetrievalSpec.groovy | 5 ++-- .../gorm/mongo/SimpleHasManySpec.groovy | 5 ++-- .../datastore/gorm/mongo/StatelessSpec.groovy | 5 ++-- .../mongo/SwitchDatabaseAtRuntimeSpec.groovy | 8 +++---- .../gorm/mongo/TestSearchSpec.groovy | 5 ++-- .../gorm/mongo/TransientPropertySpec.groovy | 5 ++-- .../mongo/WhereQueryInCriteriaSpec.groovy | 5 ++-- .../gorm/mongo/WriteConcernSpec.groovy | 5 ++-- .../gorm/mongo/bugs/GPMongoDB295Spec.groovy | 5 ++-- 114 files changed, 404 insertions(+), 288 deletions(-) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/DirtyCheckEmbeddedCollectionSpec.groovy (92%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/Face.groovy (97%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/FindNativeSpec.groovy (90%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/Nose.groovy (97%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/Person.groovy (98%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/Pet.groovy (98%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/Plant.groovy (97%) rename grails-data-mongodb/core/src/test/groovy/grails/gorm/{tests => specs}/listener/PersistenceEventListenerSpec.groovy (96%) create mode 100644 grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy similarity index 92% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy index 6798f3e409d..19a52428c10 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs + +import org.apache.grails.data.mongo.core.MongoDatastoreSpec import grails.persistence.Entity -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec + import org.bson.types.ObjectId -class DirtyCheckEmbeddedCollectionSpec extends GrailsDataTckSpec { +class DirtyCheckEmbeddedCollectionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Foo, Bar]) diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Face.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Face.groovy similarity index 97% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Face.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Face.groovy index 855cd58c497..f2bffbdfaa0 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Face.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Face.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs import grails.persistence.Entity diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy similarity index 90% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy index ffe62955681..97af7d22b95 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs + +import org.apache.grails.data.mongo.core.MongoDatastoreSpec import com.mongodb.client.FindIterable -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.grails.datastore.gorm.mongo.Product //tag::nativeImport[] @@ -31,7 +31,7 @@ import static com.mongodb.client.model.Filters.eq /** * Created by graemerocher on 24/10/16. */ -class FindNativeSpec extends GrailsDataTckSpec { +class FindNativeSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Product]) diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Nose.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Nose.groovy similarity index 97% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Nose.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Nose.groovy index 0d63bd50f6d..9fc27fa4f4d 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Nose.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Nose.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs import grails.persistence.Entity diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Person.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Person.groovy similarity index 98% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Person.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Person.groovy index eabc2b05769..99c1f240820 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Person.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Person.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs import grails.persistence.Entity import groovy.transform.EqualsAndHashCode diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Pet.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Pet.groovy similarity index 98% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Pet.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Pet.groovy index 8e53481cfda..6313e228b76 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Pet.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Pet.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs import org.apache.grails.data.testing.tck.domains.PetType import grails.persistence.Entity diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Plant.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Plant.groovy similarity index 97% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Plant.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Plant.groovy index 3aa01b1bf41..9cd5f62bc5f 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Plant.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Plant.groovy @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests +package grails.gorm.specs import grails.mongodb.MongoEntity import grails.persistence.Entity diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy similarity index 96% rename from grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy rename to grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy index ba5cd8885e8..913d1a8265a 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package grails.gorm.tests.listener +package grails.gorm.specs.listener + +import org.apache.grails.data.mongo.core.MongoDatastoreSpec import grails.gorm.DetachedCriteria import grails.persistence.Entity -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.mapping.core.Datastore import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListener @@ -34,7 +34,7 @@ import org.springframework.context.ApplicationEvent /** * @author Tom Widmer */ -class PersistenceEventListenerSpec extends GrailsDataTckSpec { +class PersistenceEventListenerSpec extends MongoDatastoreSpec { SpecPersistenceListener listener void setupSpec() { diff --git a/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy index bdb3da19db3..765eae71a35 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy @@ -18,13 +18,12 @@ */ package grails.mongodb.bootstrap -import grails.gorm.tests.Plant +import grails.gorm.specs.Plant import org.apache.grails.testing.mongo.AutoStartedMongoSpec import org.grails.datastore.mapping.config.Settings import org.grails.datastore.mapping.mongo.MongoDatastore import spock.lang.AutoCleanup import spock.lang.Shared -import spock.lang.Specification /** * Created by graemerocher on 16/12/16. diff --git a/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy index 55e857bf224..fb18c644013 100644 --- a/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/grails/mongodb/cascade/MongoCascadeSpec.groovy @@ -18,10 +18,11 @@ */ package grails.mongodb.cascade +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class MongoCascadeSpec extends GrailsDataTckSpec { +class MongoCascadeSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Product, ProductLine]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy new file mode 100644 index 00000000000..5b0668d7ba6 --- /dev/null +++ b/grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.grails.data.mongo.core + +import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec + +abstract class MongoDatastoreSpec extends GrailsDataTckSpec { +} diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy index 217cc30f0d9..3a603362abf 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AggregateMethodSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId /** * Created by graemerocher on 22/04/14. */ -class AggregateMethodSpec extends GrailsDataTckSpec { +class AggregateMethodSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([City]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy index 979c89eb683..00fedc754e9 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AssignedIdentifierSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.MongoBulkWriteException import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * Tests for usage of assigned identifiers */ -class AssignedIdentifierSpec extends GrailsDataTckSpec { +class AssignedIdentifierSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([River, Lake, Volcano]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy index 9dd7462074a..e2462f1bfa8 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/AutowireServicesSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.springframework.context.support.GenericApplicationContext -class AutowireServicesSpec extends GrailsDataTckSpec { +class AutowireServicesSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Pizza]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy index e2f1fdc6f8a..d77c911704f 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicArraySpec.groovy @@ -19,16 +19,17 @@ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId /** * @author Graeme Rocher */ -class BasicArraySpec extends GrailsDataTckSpec { +class BasicArraySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Data]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy index faa9113f5ca..af5bbc44873 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionTypeSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class BasicCollectionTypeSpec extends GrailsDataTckSpec { +class BasicCollectionTypeSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([MyCollections]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy index f28b368ca84..fbcdbcc42d9 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BasicCollectionsSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class BasicCollectionsSpec extends GrailsDataTckSpec { +class BasicCollectionsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Linguist, Increment]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy index c09cbf9d4b9..6879d715111 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy @@ -19,18 +19,18 @@ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity -import grails.gorm.tests.Plant +import grails.gorm.specs.Plant import grails.mongodb.MongoEntity -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.gorm.query.transform.ApplyDetachedCriteriaTransform /** * Created by graemerocher on 20/03/14. */ @ApplyDetachedCriteriaTransform -class BatchUpdateDeleteSpec extends GrailsDataTckSpec { +class BatchUpdateDeleteSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([BatchUser, BatchAddress, Plant]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy index 832c26331f1..fb5148ae832 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeInsertUpdateSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue /** * @author Graeme Rocher */ -class BeforeInsertUpdateSpec extends GrailsDataTckSpec { +class BeforeInsertUpdateSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([BeforeInsertUser]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeUpdatePropertyPersistenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeUpdatePropertyPersistenceSpec.groovy index 703c3e1c33c..7d78cbbe71d 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeUpdatePropertyPersistenceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BeforeUpdatePropertyPersistenceSpec.groovy @@ -18,10 +18,11 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.LastModifiedDate import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue @@ -30,7 +31,7 @@ import spock.lang.Issue * This specifically tests the scenario where a property is set in beforeUpdate() * but was NOT explicitly modified by the user code. */ -class BeforeUpdatePropertyPersistenceSpec extends GrailsDataTckSpec { +class BeforeUpdatePropertyPersistenceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([UserWithBeforeUpdate, UserWithBeforeUpdateAndAutoTimestamp]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy index cd7fb09789d..91b34ec343b 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BigDecimalSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import grails.mongodb.MongoEntity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.Decimal128 /** * Created by graemerocher on 14/12/16. */ -class BigDecimalSpec extends GrailsDataTckSpec { +class BigDecimalSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([BossMan]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy index 903df7600f4..3451a92a32c 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BrokenManyToManyAssociationSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document /** * @author Noam Y. Tenne */ -class BrokenManyToManyAssociationSpec extends GrailsDataTckSpec { +class BrokenManyToManyAssociationSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ReferencingEntity, ReferencedEntity]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy index ecb3d56097a..440344d952b 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteOneToOneSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId /** * @author Graeme Rocher */ -class CascadeDeleteOneToOneSpec extends GrailsDataTckSpec { +class CascadeDeleteOneToOneSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([SystemUser, UserSettings, Company, Executive, Employee]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy index 934d66dffee..ade183474fc 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CascadeDeleteSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue -class CascadeDeleteSpec extends GrailsDataTckSpec { +class CascadeDeleteSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([CascadeUser, CascadeUserSettings]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy index f8e29a944dc..47c2fbfdf90 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularBidirectionalOneToManySpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * Created by graemerocher on 24/08/2016. */ -class CircularBidirectionalOneToManySpec extends GrailsDataTckSpec { +class CircularBidirectionalOneToManySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Comment]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy index bac315cf4f9..5d98ac32390 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularEmbeddedListSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * Created by graemerocher on 14/03/14. */ -class CircularEmbeddedListSpec extends GrailsDataTckSpec { +class CircularEmbeddedListSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Tree]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy index c6e5690f7f8..d266f318f94 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CircularOneToManySpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * @author Graeme Rocher */ -class CircularOneToManySpec extends GrailsDataTckSpec { +class CircularOneToManySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Profile]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy index 473096bf4c6..a90b7e6dd84 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ClearCollectionSpec.groovy @@ -19,12 +19,13 @@ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId -class ClearCollectionSpec extends GrailsDataTckSpec { +class ClearCollectionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Building, Room, RoomCompany]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy index 29efcde7f3e..eec482544bc 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomCollectionAndAttributeMappingSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Tests for the case where a custom mapping is used. */ -class CustomCollectionAndAttributeMappingSpec extends GrailsDataTckSpec { +class CustomCollectionAndAttributeMappingSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([CCAAMPerson]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy index 410cf63d479..cdf41bdb1c1 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomIdProxySpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.mapping.proxy.EntityProxy import spock.lang.Issue /** * Created by graemerocher on 14/10/16. */ -class CustomIdProxySpec extends GrailsDataTckSpec { +class CustomIdProxySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([CustomIdCompany, CustomIdTeam]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy index d7ab00e1783..3ed82b1ae85 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomMongoEventListenerSpec.groovy @@ -18,9 +18,10 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.mapping.core.Datastore import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListener @@ -35,7 +36,7 @@ import static org.grails.datastore.mapping.engine.event.EventType.PreInsert import static org.grails.datastore.mapping.engine.event.EventType.PreLoad import static org.grails.datastore.mapping.engine.event.EventType.PreUpdate -class CustomMongoEventListenerSpec extends GrailsDataTckSpec { +class CustomMongoEventListenerSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Listener]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy index fed4df7ccc1..17e6641f8a7 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/CustomTypeMarshallingSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId -class CustomTypeMarshallingSpec extends GrailsDataTckSpec { +class CustomTypeMarshallingSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Person]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy index c71783008c5..dae8860a338 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DBObjectConversionSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Ignore // moved to 'gorm-ex @Ignore -class DBObjectConversionSpec extends GrailsDataTckSpec { +class DBObjectConversionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Boat, Sailor, Captain]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy index 5e0b9302bed..dd2f212027b 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DbRefWithEmbeddedSpec.groovy @@ -18,10 +18,11 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.DBRef import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId import spock.lang.Issue @@ -29,7 +30,7 @@ import spock.lang.Issue /** * @author Graeme Rocher */ -class DbRefWithEmbeddedSpec extends GrailsDataTckSpec { +class DbRefWithEmbeddedSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([One, Two]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy index 7d354035706..95c6263a28b 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DefaultSortOrderSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue -class DefaultSortOrderSpec extends GrailsDataTckSpec { +class DefaultSortOrderSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([SOBook]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy index 9f17241d7b2..5f4b0ff9b2a 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DirtyCheckUpdateSpec.groovy @@ -18,10 +18,11 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.dirty.checking.DirtyCheck import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import org.grails.datastore.mapping.dirty.checking.DirtyCheckable import org.grails.datastore.mapping.mongo.config.MongoSettings @@ -30,7 +31,7 @@ import spock.lang.Issue /** * Created by graemerocher on 14/03/14. */ -class DirtyCheckUpdateSpec extends GrailsDataTckSpec { +class DirtyCheckUpdateSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Bar]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy index 348213ee7f4..300f8dd3183 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisableVersionSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class DisableVersionSpec extends GrailsDataTckSpec { +class DisableVersionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([NoVersion]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy index 7025f5b5620..3bab2cd03d5 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy @@ -18,20 +18,21 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Pet +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Pet import org.apache.grails.data.testing.tck.domains.PetType -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec + import spock.lang.Issue -class DisjunctionQuerySpec extends GrailsDataTckSpec { +class DisjunctionQuerySpec extends MongoDatastoreSpec { def dogType def catType def birdType void setupSpec() { - manager.domainClasses += [Pet, PetType] + manager.addAllDomainClasses([Pet, PetType]) } @Issue('GPMONGODB-380') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy index 5174cc505b8..b20712a297c 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DistinctPropertySpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue -class DistinctPropertySpec extends GrailsDataTckSpec { +class DistinctPropertySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Student]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy index 8c66b6daaa9..fc2cef5cceb 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DocumentMappingSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import grails.mongodb.MongoEntity import grails.mongodb.geo.Point import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import static grails.mongodb.mapping.MappingBuilder.document @@ -30,7 +31,7 @@ import static grails.mongodb.mapping.MappingBuilder.document /** * Created by graemerocher on 02/02/2017. */ -class DocumentMappingSpec extends GrailsDataTckSpec { +class DocumentMappingSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([CustomMapping]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy index 7357cefa885..3b201ddc0bd 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedAssociationSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue -class EmbeddedAssociationSpec extends GrailsDataTckSpec { +class EmbeddedAssociationSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Individual, Individual2, Address, LongAddress]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy index 6933bfe059e..78c45ab9722 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedBiDirectionalSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Created by Jim on 8/18/2016. */ -class EmbeddedBiDirectionalSpec extends GrailsDataTckSpec { +class EmbeddedBiDirectionalSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([EBDDogOwner, EBDDog, EBDToy]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy index 37e59e7cc13..6e2daff5e5a 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionAndInheritanceSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Tests the use of embedded collections in inheritance hierarchies. */ -class EmbeddedCollectionAndInheritanceSpec extends GrailsDataTckSpec { +class EmbeddedCollectionAndInheritanceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ECAISPerson, ECAISPet, ECAISDog]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy index d57f7c56ef7..502dca6de29 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithIdSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId /** * Created by Jim on 8/15/2016. */ -class EmbeddedCollectionWithIdSpec extends GrailsDataTckSpec { +class EmbeddedCollectionWithIdSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([MainUser, EmbeddedBar]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy index b1f3af5c35d..4b7eb3943f6 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedCollectionWithOneToOneSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * @author Graeme Rocher */ -class EmbeddedCollectionWithOneToOneSpec extends GrailsDataTckSpec { +class EmbeddedCollectionWithOneToOneSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Building, Room, RoomCompany]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy index 6ed8b4461fc..6b0d4b5d7a8 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId -class EmbeddedHasManyWithBeforeUpdateSpec extends GrailsDataTckSpec { +class EmbeddedHasManyWithBeforeUpdateSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [User, UserAddress] + manager.addAllDomainClasses([User, UserAddress]) } void "Test embedded hasMany with beforeUpdate event"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy index 505f5e2b680..36a0927bc4a 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedListWithCustomTypeSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue -class EmbeddedListWithCustomTypeSpec extends GrailsDataTckSpec { +class EmbeddedListWithCustomTypeSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Person, Family]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy index 0970f689655..7bbb71d342a 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedMapSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * Created by graemerocher on 20/04/16. */ -class EmbeddedMapSpec extends GrailsDataTckSpec { +class EmbeddedMapSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([EmbeddedMapPerson]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy index 8c583b8cc67..b02e507dbd6 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSetAssignedIdSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Ignore /** * Created by graemerocher on 22/04/16. */ -class EmbeddedSetAssignedIdSpec extends GrailsDataTckSpec { +class EmbeddedSetAssignedIdSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Itemized, LineItem, SubItem, JobItem]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy index 4e3eb79d2c5..230bd6985c0 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedSimpleObjectSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedSimpleObjectSpec extends GrailsDataTckSpec { +class EmbeddedSimpleObjectSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Space]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy index fa0cefb513f..6dd2d4faf6d 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedStringListInsideEmbeddedCollectionSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedStringListInsideEmbeddedCollectionSpec extends GrailsDataTckSpec { +class EmbeddedStringListInsideEmbeddedCollectionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ESLIECPerson]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy index cdd1a87a59a..235a3a24980 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedUnsetSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue -class EmbeddedUnsetSpec extends GrailsDataTckSpec { +class EmbeddedUnsetSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([EmbeddedPetOwner, EmbeddedPet]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy index d7087424cd0..0f69a2034ca 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWhereClauseSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.services.Service import grails.gorm.services.Where import grails.persistence.Entity import jakarta.persistence.Embeddable import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedWhereClauseSpec extends GrailsDataTckSpec { +class EmbeddedWhereClauseSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([PersonAttribute]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy index 021db4ead83..554d35f323d 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithCustomFieldMappingSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedWithCustomFieldMappingSpec extends GrailsDataTckSpec { +class EmbeddedWithCustomFieldMappingSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([EWCFMPerson, EWCFMPet]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy index ff656d07c42..99737a10e55 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedWithIdSpecifiedSpec extends GrailsDataTckSpec { +class EmbeddedWithIdSpecifiedSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [SystemCustomer, PreorderTreeNode, MultiLevelKpi] + manager.addAllDomainClasses([SystemCustomer, PreorderTreeNode, MultiLevelKpi]) } void "Test that id is saved of embedded entity if specified"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy index 04916e71baa..0d2aec556a2 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedAssociationsSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document -class EmbeddedWithNonEmbeddedAssociationsSpec extends GrailsDataTckSpec { +class EmbeddedWithNonEmbeddedAssociationsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Boat, Sailor, Captain]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy index 704bae78358..38b575b920c 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithNonEmbeddedCollectionsSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedWithNonEmbeddedCollectionsSpec extends GrailsDataTckSpec { +class EmbeddedWithNonEmbeddedCollectionsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Ship, Crew, Sailor, Captain]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy index ffac13342b6..9ca1b01756a 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithinEmbeddedAssociationSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EmbeddedWithinEmbeddedAssociationSpec extends GrailsDataTckSpec { +class EmbeddedWithinEmbeddedAssociationSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Customer, Vehicle, Maker, Part, Component]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy index 581ed9dfe2b..ed9c650fc54 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumCollectionSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class EnumCollectionSpec extends GrailsDataTckSpec { +class EnumCollectionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Teacher, Teacher2, Teacher3, DerivedTeacher]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy index 3d08d09d416..15139c26b70 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EnumTypeSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import jakarta.persistence.EnumType import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId /** * Created by graemerocher on 06/05/14. */ -class EnumTypeSpec extends GrailsDataTckSpec { +class EnumTypeSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Dist]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy index f56b1df9c24..46206269d44 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EventsWithAbstractInheritanceSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * Created by graemerocher on 21/04/16. */ -class EventsWithAbstractInheritanceSpec extends GrailsDataTckSpec { +class EventsWithAbstractInheritanceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ConcreteEventDomain]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy index 54541921c9d..dfec1275bc9 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/FindOrCreateWhereSpec.groovy @@ -18,11 +18,11 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Pet -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec -class FindOrCreateWhereSpec extends GrailsDataTckSpec { +import grails.gorm.specs.Pet + +class FindOrCreateWhereSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Person, Pet]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy index c469bf54fac..971eb74b586 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeoJSONTypePersistenceSpec.groovy @@ -18,6 +18,8 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.geo.Box import grails.mongodb.geo.Circle import grails.mongodb.geo.GeometryCollection @@ -31,12 +33,11 @@ import grails.mongodb.geo.Shape import grails.mongodb.geo.Sphere import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Created by graemerocher on 17/03/14. */ -class GeoJSONTypePersistenceSpec extends GrailsDataTckSpec { +class GeoJSONTypePersistenceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Place, Loc]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy index dbd9c434f7e..65e83360ed4 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GeospacialQuerySpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class GeospacialQuerySpec extends GrailsDataTckSpec { +class GeospacialQuerySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Hotel]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy index 05e2323c550..edc8a2c6e18 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy @@ -18,19 +18,19 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Pet -import grails.gorm.tests.Person +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Pet +import grails.gorm.specs.Person import org.apache.grails.data.testing.tck.domains.PetType -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * @author Graeme Rocher */ -class GetAllSpec extends GrailsDataTckSpec { +class GetAllSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Pet, Person, PetType] + manager.addAllDomainClasses([Pet, Person, PetType]) } void "test that 'null' returns null"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy index 4d708fea976..75dac0716ea 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllWithStringIdSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * @author Graeme Rocher */ -class GetAllWithStringIdSpec extends GrailsDataTckSpec { +class GetAllWithStringIdSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([GetItem]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy index a338b88b224..ca782e36c28 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GreaterThanAndLessThanCriteriaSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue -class GreaterThanAndLessThanCriteriaSpec extends GrailsDataTckSpec { +class GreaterThanAndLessThanCriteriaSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([GTBook]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy index 5233194a470..199cae2ff56 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HasOneSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Tests hasOne functionality with MongoDB. */ -class HasOneSpec extends GrailsDataTckSpec { +class HasOneSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Face, Nose]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy index 9157f568de6..97d5d9906b9 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy @@ -18,18 +18,18 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.MongoException import com.mongodb.MongoQueryException import grails.gorm.CriteriaBuilder import grails.gorm.DetachedCriteria -import grails.gorm.tests.Person -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import grails.gorm.specs.Person -class HintQueryArgumentSpec extends GrailsDataTckSpec { +class HintQueryArgumentSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Person] + manager.addAllDomainClasses([Person]) } void "Test that hints work on criteria queries"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy index a0d7a9068f0..3aa3b4caae9 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy @@ -18,18 +18,19 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Person -import grails.gorm.tests.Pet +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Person +import grails.gorm.specs.Pet import org.apache.grails.data.testing.tck.domains.PetType -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec + import spock.lang.Issue -class InListQuerySpec extends GrailsDataTckSpec { +class InListQuerySpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Pet, Person, PetType] + manager.addAllDomainClasses([Pet, Person, PetType]) } @Issue('https://github.com/grails/grails-data-mongodb/issues/11') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy index af22c792eca..e3b8e358f11 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexAttributesAndCompoundKeySpec.groovy @@ -18,17 +18,18 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.WriteConcern import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue /** * Created by graemerocher on 25/03/14. */ -class IndexAttributesAndCompoundKeySpec extends GrailsDataTckSpec { +class IndexAttributesAndCompoundKeySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ServerStream]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy index ff500323407..f666b4d84c5 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IndexWithInheritanceSpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import grails.mongodb.MongoEntity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Created by graemerocher on 24/08/2016. */ -class IndexWithInheritanceSpec extends GrailsDataTckSpec { +class IndexWithInheritanceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Lion, Mammal]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy index d8f9f4f44a1..d360409d6d5 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceQueryingSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document -class InheritanceQueryingSpec extends GrailsDataTckSpec { +class InheritanceQueryingSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([A, B, C]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy index dfd5fa677dd..28c56c5ce5b 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InheritanceWithSingleEndedAssociationSpec.groovy @@ -18,9 +18,10 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import org.grails.datastore.mapping.proxy.EntityProxy import spock.lang.Issue @@ -28,7 +29,7 @@ import spock.lang.Issue /** * @author Graeme Rocher */ -class InheritanceWithSingleEndedAssociationSpec extends GrailsDataTckSpec { +class InheritanceWithSingleEndedAssociationSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Node, NodeA, NodeB, NodeC]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy index ce3aaf58e01..a3236970018 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InnerEnumSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Created by graemerocher on 05/01/16. */ -class InnerEnumSpec extends GrailsDataTckSpec { +class InnerEnumSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([InnerPerson]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy index 1daac352517..dc7c5667ca8 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/IsNullSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue -class IsNullSpec extends GrailsDataTckSpec { +class IsNullSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Elephant, Trunk]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy index 37cbe43a39c..96f829fb44c 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/JakartaValidationSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import jakarta.validation.constraints.Digits import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Created by graemerocher on 30/12/2016. */ -class JakartaValidationSpec extends GrailsDataTckSpec { +class JakartaValidationSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([JakartaProduct]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy index 041d3efac17..a8e809f7870 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LastUpdatedSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec /** * Created by graemerocher on 20/04/16. */ -class LastUpdatedSpec extends GrailsDataTckSpec { +class LastUpdatedSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([LastUpdateMe]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy index 4562fa68a43..7a8a27f82fc 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy @@ -18,14 +18,14 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Pet -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec -class LikeQuerySpec extends GrailsDataTckSpec { +import grails.gorm.specs.Pet + +class LikeQuerySpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Pet] + manager.addAllDomainClasses([Pet]) } void "Test for like query"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy index 591e8ceec65..6711aed41e3 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ListOneToManyOrderingSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue -class ListOneToManyOrderingSpec extends GrailsDataTckSpec { +class ListOneToManyOrderingSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Judge, Juror]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy index 478407e2f88..4d1444766a5 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MapOfDomainsSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import groovy.transform.EqualsAndHashCode import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId /** * Created by graemerocher on 22/04/14. */ -class MapOfDomainsSpec extends GrailsDataTckSpec { +class MapOfDomainsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Smartphones]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy index eb059e08429..f2315723845 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MarkDirtyFalseSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.dirty.checking.DirtyCheck import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import org.grails.datastore.mapping.mongo.config.MongoSettings -class MarkDirtyFalseSpec extends GrailsDataTckSpec { +class MarkDirtyFalseSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Bar, BarWithTimestamp]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy index 1cd68882696..40972df98f7 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoDynamicPropertyOnEmbeddedSpec.groovy @@ -18,9 +18,10 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId import spock.lang.Issue @@ -28,7 +29,7 @@ import spock.lang.Issue /** * @author Graeme Rocher */ -class MongoDynamicPropertyOnEmbeddedSpec extends GrailsDataTckSpec { +class MongoDynamicPropertyOnEmbeddedSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Container]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy index e936d296fe6..a6ec1bf679d 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoEntityConfigSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.client.MongoClient import com.mongodb.client.MongoDatabase import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.mapping.document.config.DocumentPersistentEntity import org.grails.datastore.mapping.model.PersistentEntity import org.grails.datastore.mapping.mongo.AbstractMongoSession @@ -31,7 +32,7 @@ import org.grails.datastore.mapping.mongo.config.MongoAttribute import org.grails.datastore.mapping.mongo.config.MongoCollection import com.mongodb.WriteConcern -class MongoEntityConfigSpec extends GrailsDataTckSpec { +class MongoEntityConfigSpec extends MongoDatastoreSpec { def "Test custom collection config"() { given: diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy index 706887f1468..ad19cd95852 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoGormEnhancerSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.client.MongoCollection import grails.mongodb.MongoEntity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class MongoGormEnhancerSpec extends GrailsDataTckSpec { +class MongoGormEnhancerSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([MyMongoEntity]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy index 17fa0f81fc9..4ee2625fdd6 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy @@ -18,17 +18,17 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Person -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Person /** * @author Graeme Rocher */ -class MongoResultsListIndexSpec extends GrailsDataTckSpec { +class MongoResultsListIndexSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Person] + manager.addAllDomainClasses([Person]) } void "Test that indexing into results works with MongoDB"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy index 32518a3e09c..21f4cf788be 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoTypesSpec.groovy @@ -18,14 +18,15 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.Binary import org.bson.types.ObjectId -class MongoTypesSpec extends GrailsDataTckSpec { +class MongoTypesSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([MongoTypes]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy index 7a933c590e2..7822c9444f8 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy @@ -18,14 +18,14 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Person -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec -class NegateInListSpec extends GrailsDataTckSpec { +import grails.gorm.specs.Person + +class NegateInListSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Person] + manager.addAllDomainClasses([Person]) } void "Test negate in list query"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy index b86cb5384fd..643f80244b5 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegationEnumSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId -class NegationEnumSpec extends GrailsDataTckSpec { +class NegationEnumSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([HasEnum]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy index 5d5dc5f2ee5..08a134c33d5 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy @@ -18,18 +18,18 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Pet -import grails.gorm.tests.Person -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Pet +import grails.gorm.specs.Person /** * Tests the nullification of properties */ -class NullifyPropertySpec extends GrailsDataTckSpec { +class NullifyPropertySpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Pet, Person] + manager.addAllDomainClasses([Pet, Person]) } void "Test nullify basic property"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy index 0b7cbea7ea2..21642eb20c2 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullsAreNotStoredSpec.groovy @@ -18,9 +18,10 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId import grails.persistence.Entity @@ -28,7 +29,7 @@ import grails.persistence.Entity /** * */ -class NullsAreNotStoredSpec extends GrailsDataTckSpec { +class NullsAreNotStoredSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([NANSPerson]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy index d960890fc15..3560d4728b8 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId -class ObjectIdPersistenceSpec extends GrailsDataTckSpec { +class ObjectIdPersistenceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([MongoObjectIdEntity]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy index 659499a63b6..66ab3ac23bf 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPropertySpec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId /** * Created by graemerocher on 29/02/16. */ -class ObjectIdPropertySpec extends GrailsDataTckSpec { +class ObjectIdPropertySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ObjectIdPerson]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy index e6561a97bc8..47cc7af5b93 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToManyWithInheritanceSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class OneToManyWithInheritanceSpec extends GrailsDataTckSpec { +class OneToManyWithInheritanceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Animal, Donkey, Carrot]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy index 10bf1feb6cd..07a7c70c894 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy @@ -18,18 +18,19 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Face -import grails.gorm.tests.Nose -import grails.gorm.tests.Person -import grails.gorm.tests.Pet -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Face +import grails.gorm.specs.Nose +import grails.gorm.specs.Person +import grails.gorm.specs.Pet + import org.bson.Document -class OneToOneIntegritySpec extends GrailsDataTckSpec { +class OneToOneIntegritySpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Person, Pet, Face, Nose] + manager.addAllDomainClasses([Person, Pet, Face, Nose]) } def "Test persist and retrieve unidirectional many-to-one"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy index e730135daf1..c2bc9b38a55 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneNoReferenceSpec.groovy @@ -18,12 +18,13 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId -class OneToOneNoReferenceSpec extends GrailsDataTckSpec { +class OneToOneNoReferenceSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([OtherNoRef, NoRef]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy index fd8441a3ffb..1599ad1f132 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OptimisticLockingWithExceptionSpec.groovy @@ -18,17 +18,18 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import jakarta.persistence.FlushModeType import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.mapping.core.OptimisticLockingException import spock.lang.Issue /** * @author Graeme Rocher */ -class OptimisticLockingWithExceptionSpec extends GrailsDataTckSpec { +class OptimisticLockingWithExceptionSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Counter]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy index a630d402d56..c754abfe1f4 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy @@ -18,18 +18,19 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Plant -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Plant + import spock.lang.Issue /** * Created by graemerocher on 14/03/14. */ -class OrderWithPaginationSpec extends GrailsDataTckSpec { +class OrderWithPaginationSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Plant] + manager.addAllDomainClasses([Plant]) } @Issue('GPMONGODB-241') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy index 804637068a6..6497f120189 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ProjectionsSpec.groovy @@ -18,17 +18,18 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.DetachedCriteria import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue /** * Created by graemerocher on 15/04/14. */ -class ProjectionsSpec extends GrailsDataTckSpec { +class ProjectionsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Dog]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy index 9d7e225569b..eeb0f12436c 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/QueriesWithIdenticallyNamedPartsSpec.groovy @@ -18,9 +18,10 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue @@ -28,7 +29,7 @@ import spock.lang.Issue * Test cases for GPMONGODB-296 (and GPMONGODB-302). */ @Issue('GPMONGODB-296') -class QueriesWithIdenticallyNamedPartsSpec extends GrailsDataTckSpec { +class QueriesWithIdenticallyNamedPartsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Foo]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy index 4d9f7f1c7b7..eb09e67f05f 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy @@ -18,29 +18,29 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.MongoQueryException import com.mongodb.ReadConcern import com.mongodb.WriteConcern import grails.gorm.CriteriaBuilder import grails.gorm.DetachedCriteria -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.grails.datastore.mapping.mongo.MongoCodecSession import spock.lang.Ignore /** * Created by graemerocher on 03/02/2017. */ -class ReadConcernArgumentSpec extends GrailsDataTckSpec { +class ReadConcernArgumentSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [grails.gorm.tests.Person] + manager.addAllDomainClasses([grails.gorm.specs.Person]) } @Ignore void "Test that read concern work on criteria queries"() { when: "A criteria query is created with a hint" - CriteriaBuilder c = grails.gorm.tests.Person.createCriteria() + CriteriaBuilder c = grails.gorm.specs.Person.createCriteria() c.list { eq 'firstName', 'Bob' arguments readConcern: ReadConcern.MAJORITY @@ -52,7 +52,7 @@ class ReadConcernArgumentSpec extends GrailsDataTckSpec detachedCriteria = new DetachedCriteria<>(grails.gorm.tests.Person) + DetachedCriteria detachedCriteria = new DetachedCriteria<>(grails.gorm.specs.Person) detachedCriteria = detachedCriteria.build { eq 'firstName', 'Bob' } @@ -77,13 +77,13 @@ class ReadConcernArgumentSpec extends GrailsDataTckSpec - new grails.gorm.tests.Person(firstName: "Bob", lastName: "Smith").save(validate: false) + grails.gorm.specs.Person.withSession { MongoCodecSession session -> + new grails.gorm.specs.Person(firstName: "Bob", lastName: "Smith").save(validate: false) session.flush(WriteConcern.MAJORITY) } then: - grails.gorm.tests.Person.count() == 1 + grails.gorm.specs.Person.count() == 1 } } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy index e0109090c9b..d043d3d748a 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadManyObjectsSpec.groovy @@ -18,9 +18,10 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId import spock.lang.Requires @@ -31,7 +32,7 @@ import spock.lang.Requires @Requires({ System.getenv().get('CI') as Boolean }) -class ReadManyObjectsSpec extends GrailsDataTckSpec { +class ReadManyObjectsSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([ProfileDoc]) } diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy index d544d3aaf53..e4ff3ded4a3 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy @@ -18,18 +18,19 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Plant -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Plant + import spock.lang.Issue /** * Created by graemerocher on 16/04/14. */ -class ResultsWithGroovyCollectionMethodsSpec extends GrailsDataTckSpec { +class ResultsWithGroovyCollectionMethodsSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Plant] + manager.addAllDomainClasses([Plant]) } @Issue('GPMONGODB-316') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy index 2a12f63d629..170d096dbdd 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy @@ -18,13 +18,13 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Plant -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec -class SchemalessSpec extends GrailsDataTckSpec { +import grails.gorm.specs.Plant + +class SchemalessSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Plant] + manager.addAllDomainClasses([Plant]) } def "Test attach additional data"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy index 6ff5f773961..80d662a5b8f 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy @@ -18,16 +18,16 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Person -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Person /** * Tests related to caching of entities. */ -class SessionCachingSpec extends GrailsDataTckSpec { +class SessionCachingSpec extends MongoDatastoreSpec { void setupSpec() { - manager.domainClasses += [Person] + manager.addAllDomainClasses([Person]) } void "test cache used for get"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy index e82bad6571e..8b137df636d 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SetRetrievalSpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.client.MongoDatabase import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.Document import org.bson.types.ObjectId import spock.lang.Issue @@ -30,7 +31,7 @@ import spock.lang.Issue /** * Created by graemerocher on 01/04/16. */ -class SetRetrievalSpec extends GrailsDataTckSpec { +class SetRetrievalSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Team, Player]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy index a40a3df3e14..fed196f16ae 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SimpleHasManySpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId import spock.lang.Issue /** * Created by graemerocher on 25/03/14. */ -class SimpleHasManySpec extends GrailsDataTckSpec { +class SimpleHasManySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Book, Chapter]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy index 9671f606882..b79e46f5bd4 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/StatelessSpec.groovy @@ -18,10 +18,11 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class StatelessSpec extends GrailsDataTckSpec { +class StatelessSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Volcano]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy index 264e6f2775e..1ca582c1b78 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy @@ -18,14 +18,14 @@ */ package org.grails.datastore.gorm.mongo -import grails.gorm.tests.Person -import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + +import grails.gorm.specs.Person /** * @author Graeme Rocher */ -class SwitchDatabaseAtRuntimeSpec extends GrailsDataTckSpec { +class SwitchDatabaseAtRuntimeSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Person]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy index e50c08c9a86..90edfb53bfc 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TestSearchSpec.groovy @@ -18,16 +18,17 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.mongodb.MongoEntity import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import org.bson.types.ObjectId /** * Created by graemerocher on 14/04/14. */ -class TestSearchSpec extends GrailsDataTckSpec { +class TestSearchSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Product]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy index b58f9e8e148..054ead2fe95 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/TransientPropertySpec.groovy @@ -18,11 +18,12 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec -class TransientPropertySpec extends GrailsDataTckSpec { +class TransientPropertySpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([Cow]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy index bab536980d9..5346b88b510 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WhereQueryInCriteriaSpec.groovy @@ -18,13 +18,14 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.gorm.annotation.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Ignore import spock.lang.Shared -class WhereQueryInCriteriaSpec extends GrailsDataTckSpec { +class WhereQueryInCriteriaSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([InCritOwner, InCritDog]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy index 982580951cd..93457f232aa 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/WriteConcernSpec.groovy @@ -18,10 +18,11 @@ */ package org.grails.datastore.gorm.mongo +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import com.mongodb.WriteConcern import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue import static grails.mongodb.mapping.MappingBuilder.document @@ -29,7 +30,7 @@ import static grails.mongodb.mapping.MappingBuilder.document /** * Tests usage of WriteConcern */ -class WriteConcernSpec extends GrailsDataTckSpec { +class WriteConcernSpec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([SafeWrite, UnacknowledgedWrite]) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy index 23f8767a8ad..662a231bf1f 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/bugs/GPMongoDB295Spec.groovy @@ -18,15 +18,16 @@ */ package org.grails.datastore.gorm.mongo.bugs +import org.apache.grails.data.mongo.core.MongoDatastoreSpec + import grails.persistence.Entity import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager -import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec import spock.lang.Issue /** * @author Graeme Rocher */ -class GPMongoDB295Spec extends GrailsDataTckSpec { +class GPMongoDB295Spec extends MongoDatastoreSpec { void setupSpec() { manager.domainClasses.addAll([InheritUser, ObjParent, UserGroup, User, UserObject]) } From b5a7aa76256cdf71753b632c8a8666c8e6961f47 Mon Sep 17 00:00:00 2001 From: James Fredley Date: Wed, 27 May 2026 22:01:32 -0400 Subject: [PATCH 2/2] Address Copilot review feedback: use direct domainClasses.addAll 16 mongo specs in this PR called manager.addAllDomainClasses(...), a helper method that does not exist on 8.0.x. The helper is introduced by a sibling PR (#15683, the GrailsDataTckManager helper extraction) that this PR does not depend on. The setupSpec calls were inherited from the staging branch where both changes already coexisted. On 8.0.x in isolation, the helper method is undefined and the specs would throw MissingMethodException at runtime. Converting all 16 callers to the existing manager.domainClasses.addAll pattern so this PR is self-contained against 8.0.x. After both this PR and #15683 land, the callers can be optionally converted to use the helper in a follow-up (or naturally via the next merge of 8.0.x into the staging branch), but that is not a prerequisite for this PR. Files updated: - DisjunctionQuerySpec.groovy - EmbeddedHasManyWithBeforeUpdateSpec.groovy - EmbeddedWithIdSpecifiedSpec.groovy - GetAllSpec.groovy - HintQueryArgumentSpec.groovy - InListQuerySpec.groovy - LikeQuerySpec.groovy - MongoResultsListIndexSpec.groovy - NegateInListSpec.groovy - NullifyPropertySpec.groovy - OneToOneIntegritySpec.groovy - OrderWithPaginationSpec.groovy - ReadConcernArgumentSpec.groovy - ResultsWithGroovyCollectionMethodsSpec.groovy - SchemalessSpec.groovy - SessionCachingSpec.groovy Verified locally with ./gradlew :grails-data-mongodb-core:compileTestGroovy. Assisted-by: claude-code:claude-4.7-opus --- .../org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy | 2 +- .../gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy | 2 +- .../datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy | 2 +- .../groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy | 2 +- .../grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy | 2 +- .../org/grails/datastore/gorm/mongo/InListQuerySpec.groovy | 2 +- .../groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy | 2 +- .../datastore/gorm/mongo/MongoResultsListIndexSpec.groovy | 2 +- .../org/grails/datastore/gorm/mongo/NegateInListSpec.groovy | 2 +- .../org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy | 2 +- .../grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy | 2 +- .../grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy | 2 +- .../grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy | 2 +- .../gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy | 2 +- .../org/grails/datastore/gorm/mongo/SchemalessSpec.groovy | 2 +- .../org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy index 3bab2cd03d5..c86c3f40a93 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/DisjunctionQuerySpec.groovy @@ -32,7 +32,7 @@ class DisjunctionQuerySpec extends MongoDatastoreSpec { def birdType void setupSpec() { - manager.addAllDomainClasses([Pet, PetType]) + manager.domainClasses.addAll([Pet, PetType]) } @Issue('GPMONGODB-380') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy index 6b0d4b5d7a8..f245bdfbc69 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedHasManyWithBeforeUpdateSpec.groovy @@ -27,7 +27,7 @@ import org.bson.types.ObjectId class EmbeddedHasManyWithBeforeUpdateSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([User, UserAddress]) + manager.domainClasses.addAll([User, UserAddress]) } void "Test embedded hasMany with beforeUpdate event"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy index 99737a10e55..194ba902692 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy @@ -26,7 +26,7 @@ import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager class EmbeddedWithIdSpecifiedSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([SystemCustomer, PreorderTreeNode, MultiLevelKpi]) + manager.domainClasses.addAll([SystemCustomer, PreorderTreeNode, MultiLevelKpi]) } void "Test that id is saved of embedded entity if specified"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy index edc8a2c6e18..f16e4260454 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/GetAllSpec.groovy @@ -30,7 +30,7 @@ import org.apache.grails.data.testing.tck.domains.PetType class GetAllSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Pet, Person, PetType]) + manager.domainClasses.addAll([Pet, Person, PetType]) } void "test that 'null' returns null"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy index 97d5d9906b9..ac55b9e4dcf 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/HintQueryArgumentSpec.groovy @@ -29,7 +29,7 @@ import grails.gorm.specs.Person class HintQueryArgumentSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Person]) + manager.domainClasses.addAll([Person]) } void "Test that hints work on criteria queries"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy index 3aa3b4caae9..33288f9c858 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/InListQuerySpec.groovy @@ -30,7 +30,7 @@ import spock.lang.Issue class InListQuerySpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Pet, Person, PetType]) + manager.domainClasses.addAll([Pet, Person, PetType]) } @Issue('https://github.com/grails/grails-data-mongodb/issues/11') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy index 7a8a27f82fc..25dd9aaaf95 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/LikeQuerySpec.groovy @@ -25,7 +25,7 @@ import grails.gorm.specs.Pet class LikeQuerySpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Pet]) + manager.domainClasses.addAll([Pet]) } void "Test for like query"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy index 4ee2625fdd6..dd6ee7a07ef 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/MongoResultsListIndexSpec.groovy @@ -28,7 +28,7 @@ import grails.gorm.specs.Person class MongoResultsListIndexSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Person]) + manager.domainClasses.addAll([Person]) } void "Test that indexing into results works with MongoDB"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy index 7822c9444f8..505fc45178d 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NegateInListSpec.groovy @@ -25,7 +25,7 @@ import grails.gorm.specs.Person class NegateInListSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Person]) + manager.domainClasses.addAll([Person]) } void "Test negate in list query"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy index 08a134c33d5..ebdbfbf93a0 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/NullifyPropertySpec.groovy @@ -29,7 +29,7 @@ import grails.gorm.specs.Person class NullifyPropertySpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Pet, Person]) + manager.domainClasses.addAll([Pet, Person]) } void "Test nullify basic property"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy index 07a7c70c894..4dc315cc4b2 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OneToOneIntegritySpec.groovy @@ -30,7 +30,7 @@ import org.bson.Document class OneToOneIntegritySpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Person, Pet, Face, Nose]) + manager.domainClasses.addAll([Person, Pet, Face, Nose]) } def "Test persist and retrieve unidirectional many-to-one"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy index c754abfe1f4..7ed25c0089e 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/OrderWithPaginationSpec.groovy @@ -30,7 +30,7 @@ import spock.lang.Issue class OrderWithPaginationSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Plant]) + manager.domainClasses.addAll([Plant]) } @Issue('GPMONGODB-241') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy index eb09e67f05f..95d79324e99 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ReadConcernArgumentSpec.groovy @@ -34,7 +34,7 @@ import spock.lang.Ignore class ReadConcernArgumentSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([grails.gorm.specs.Person]) + manager.domainClasses.addAll([grails.gorm.specs.Person]) } @Ignore diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy index e4ff3ded4a3..c17ba8bdeb9 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ResultsWithGroovyCollectionMethodsSpec.groovy @@ -30,7 +30,7 @@ import spock.lang.Issue class ResultsWithGroovyCollectionMethodsSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Plant]) + manager.domainClasses.addAll([Plant]) } @Issue('GPMONGODB-316') diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy index 170d096dbdd..1cf1d1e2371 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SchemalessSpec.groovy @@ -24,7 +24,7 @@ import grails.gorm.specs.Plant class SchemalessSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Plant]) + manager.domainClasses.addAll([Plant]) } def "Test attach additional data"() { diff --git a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy index 80d662a5b8f..392a8e9cb3c 100644 --- a/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy +++ b/grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/SessionCachingSpec.groovy @@ -27,7 +27,7 @@ import grails.gorm.specs.Person */ class SessionCachingSpec extends MongoDatastoreSpec { void setupSpec() { - manager.addAllDomainClasses([Person]) + manager.domainClasses.addAll([Person]) } void "test cache used for get"() {