You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/05/12 14:16:00 UTC
(grails-core) branch 8.0.x-stage-hibernate7 updated: Pull forward base tck test
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch 8.0.x-stage-hibernate7
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/8.0.x-stage-hibernate7 by this push:
new c8cb43f2ec Pull forward base tck test
c8cb43f2ec is described below
commit c8cb43f2ec0b945452cd757e61ca38a81fcd4af5
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Tue May 12 10:15:52 2026 -0400
Pull forward base tck test
---
.../specs/DirtyCheckEmbeddedCollectionSpec.groovy | 7 +++---
.../groovy/grails/gorm/specs/FindNativeSpec.groovy | 6 ++---
.../listener/PersistenceEventListenerSpec.groovy | 6 ++---
.../grails/mongodb/cascade/MongoCascadeSpec.groovy | 5 ++--
.../data/mongo/core/MongoDatastoreSpec.groovy} | 29 ++--------------------
.../gorm/mongo/AggregateMethodSpec.groovy | 5 ++--
.../gorm/mongo/AssignedIdentifierSpec.groovy | 5 ++--
.../gorm/mongo/AutowireServicesSpec.groovy | 5 ++--
.../datastore/gorm/mongo/BasicArraySpec.groovy | 5 ++--
.../gorm/mongo/BasicCollectionTypeSpec.groovy | 5 ++--
.../gorm/mongo/BasicCollectionsSpec.groovy | 5 ++--
.../gorm/mongo/BatchUpdateDeleteSpec.groovy | 6 ++---
.../gorm/mongo/BeforeInsertUpdateSpec.groovy | 5 ++--
.../BeforeUpdatePropertyPersistenceSpec.groovy | 5 ++--
.../datastore/gorm/mongo/BigDecimalSpec.groovy | 5 ++--
.../mongo/BrokenManyToManyAssociationSpec.groovy | 5 ++--
.../gorm/mongo/CascadeDeleteOneToOneSpec.groovy | 5 ++--
.../datastore/gorm/mongo/CascadeDeleteSpec.groovy | 5 ++--
.../CircularBidirectionalOneToManySpec.groovy | 5 ++--
.../gorm/mongo/CircularEmbeddedListSpec.groovy | 5 ++--
.../gorm/mongo/CircularOneToManySpec.groovy | 5 ++--
.../gorm/mongo/ClearCollectionSpec.groovy | 5 ++--
.../CustomCollectionAndAttributeMappingSpec.groovy | 5 ++--
.../datastore/gorm/mongo/CustomIdProxySpec.groovy | 5 ++--
.../gorm/mongo/CustomMongoEventListenerSpec.groovy | 5 ++--
.../gorm/mongo/CustomTypeMarshallingSpec.groovy | 5 ++--
.../gorm/mongo/DBObjectConversionSpec.groovy | 5 ++--
.../gorm/mongo/DbRefWithEmbeddedSpec.groovy | 5 ++--
.../gorm/mongo/DefaultSortOrderSpec.groovy | 5 ++--
.../gorm/mongo/DirtyCheckUpdateSpec.groovy | 5 ++--
.../datastore/gorm/mongo/DisableVersionSpec.groovy | 5 ++--
.../gorm/mongo/DisjunctionQuerySpec.groovy | 9 ++++---
.../gorm/mongo/DistinctPropertySpec.groovy | 5 ++--
.../gorm/mongo/DocumentMappingSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedAssociationSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedBiDirectionalSpec.groovy | 5 ++--
.../EmbeddedCollectionAndInheritanceSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedCollectionWithIdSpec.groovy | 5 ++--
.../EmbeddedCollectionWithOneToOneSpec.groovy | 5 ++--
.../EmbeddedHasManyWithBeforeUpdateSpec.groovy | 7 +++---
.../mongo/EmbeddedListWithCustomTypeSpec.groovy | 5 ++--
.../datastore/gorm/mongo/EmbeddedMapSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedSetAssignedIdSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedSimpleObjectSpec.groovy | 5 ++--
...edStringListInsideEmbeddedCollectionSpec.groovy | 5 ++--
.../datastore/gorm/mongo/EmbeddedUnsetSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedWhereClauseSpec.groovy | 5 ++--
.../EmbeddedWithCustomFieldMappingSpec.groovy | 5 ++--
.../gorm/mongo/EmbeddedWithIdSpecifiedSpec.groovy | 7 +++---
.../EmbeddedWithNonEmbeddedAssociationsSpec.groovy | 5 ++--
.../EmbeddedWithNonEmbeddedCollectionsSpec.groovy | 5 ++--
.../EmbeddedWithinEmbeddedAssociationSpec.groovy | 5 ++--
.../datastore/gorm/mongo/EnumCollectionSpec.groovy | 5 ++--
.../datastore/gorm/mongo/EnumTypeSpec.groovy | 5 ++--
.../mongo/EventsWithAbstractInheritanceSpec.groovy | 5 ++--
.../gorm/mongo/FindOrCreateWhereSpec.groovy | 6 ++---
.../gorm/mongo/GeoJSONTypePersistenceSpec.groovy | 5 ++--
.../gorm/mongo/GeospacialQuerySpec.groovy | 5 ++--
.../grails/datastore/gorm/mongo/GetAllSpec.groovy | 8 +++---
.../gorm/mongo/GetAllWithStringIdSpec.groovy | 5 ++--
.../GreaterThanAndLessThanCriteriaSpec.groovy | 5 ++--
.../grails/datastore/gorm/mongo/HasOneSpec.groovy | 5 ++--
.../gorm/mongo/HintQueryArgumentSpec.groovy | 8 +++---
.../datastore/gorm/mongo/InListQuerySpec.groovy | 9 ++++---
.../mongo/IndexAttributesAndCompoundKeySpec.groovy | 5 ++--
.../gorm/mongo/IndexWithInheritanceSpec.groovy | 5 ++--
.../gorm/mongo/InheritanceQueryingSpec.groovy | 5 ++--
...nheritanceWithSingleEndedAssociationSpec.groovy | 5 ++--
.../datastore/gorm/mongo/InnerEnumSpec.groovy | 5 ++--
.../grails/datastore/gorm/mongo/IsNullSpec.groovy | 5 ++--
.../gorm/mongo/JakartaValidationSpec.groovy | 5 ++--
.../datastore/gorm/mongo/LastUpdatedSpec.groovy | 5 ++--
.../datastore/gorm/mongo/LikeQuerySpec.groovy | 8 +++---
.../gorm/mongo/ListOneToManyOrderingSpec.groovy | 5 ++--
.../datastore/gorm/mongo/MapOfDomainsSpec.groovy | 5 ++--
.../datastore/gorm/mongo/MarkDirtyFalseSpec.groovy | 5 ++--
.../MongoDynamicPropertyOnEmbeddedSpec.groovy | 5 ++--
.../gorm/mongo/MongoEntityConfigSpec.groovy | 5 ++--
.../gorm/mongo/MongoGormEnhancerSpec.groovy | 5 ++--
.../gorm/mongo/MongoResultsListIndexSpec.groovy | 8 +++---
.../datastore/gorm/mongo/MongoTypesSpec.groovy | 5 ++--
.../datastore/gorm/mongo/NegateInListSpec.groovy | 8 +++---
.../datastore/gorm/mongo/NegationEnumSpec.groovy | 5 ++--
.../gorm/mongo/NullifyPropertySpec.groovy | 8 +++---
.../gorm/mongo/NullsAreNotStoredSpec.groovy | 5 ++--
.../gorm/mongo/ObjectIdPersistenceSpec.groovy | 5 ++--
.../gorm/mongo/ObjectIdPropertySpec.groovy | 5 ++--
.../gorm/mongo/OneToManyWithInheritanceSpec.groovy | 5 ++--
.../gorm/mongo/OneToOneIntegritySpec.groovy | 9 ++++---
.../gorm/mongo/OneToOneNoReferenceSpec.groovy | 5 ++--
.../OptimisticLockingWithExceptionSpec.groovy | 5 ++--
.../gorm/mongo/OrderWithPaginationSpec.groovy | 9 ++++---
.../datastore/gorm/mongo/ProjectionsSpec.groovy | 5 ++--
.../QueriesWithIdenticallyNamedPartsSpec.groovy | 5 ++--
.../gorm/mongo/ReadConcernArgumentSpec.groovy | 8 +++---
.../gorm/mongo/ReadManyObjectsSpec.groovy | 5 ++--
.../ResultsWithGroovyCollectionMethodsSpec.groovy | 9 ++++---
.../datastore/gorm/mongo/SchemalessSpec.groovy | 8 +++---
.../datastore/gorm/mongo/SessionCachingSpec.groovy | 8 +++---
.../datastore/gorm/mongo/SetRetrievalSpec.groovy | 5 ++--
.../datastore/gorm/mongo/SimpleHasManySpec.groovy | 5 ++--
.../datastore/gorm/mongo/StatelessSpec.groovy | 5 ++--
.../gorm/mongo/SwitchDatabaseAtRuntimeSpec.groovy | 6 ++---
.../datastore/gorm/mongo/TestSearchSpec.groovy | 5 ++--
.../gorm/mongo/TransientPropertySpec.groovy | 5 ++--
.../gorm/mongo/WhereQueryInCriteriaSpec.groovy | 5 ++--
.../datastore/gorm/mongo/WriteConcernSpec.groovy | 5 ++--
.../gorm/mongo/bugs/GPMongoDB295Spec.groovy | 5 ++--
108 files changed, 345 insertions(+), 277 deletions(-)
diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy
index 7e060fdcf8..fc1231ad24 100644
--- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy
+++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy
@@ -18,12 +18,13 @@
*/
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<GrailsDataMongoTckManager> {
+class DirtyCheckEmbeddedCollectionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([Foo, Bar])
diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy
index db007f4739..1dcc1c5a7f 100644
--- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy
+++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy
@@ -18,9 +18,9 @@
*/
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<GrailsDataMongoTckManager> {
+class FindNativeSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([Product])
diff --git a/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy
index 94ec7a45ff..f208164772 100644
--- a/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy
+++ b/grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy
@@ -18,10 +18,10 @@
*/
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<GrailsDataMongoTckManager> {
+class PersistenceEventListenerSpec extends MongoDatastoreSpec {
SpecPersistenceListener listener
void setupSpec() {
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 305115d7a8..fdae5a1caa 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<GrailsDataMongoTckManager> {
+class MongoCascadeSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([Product, ProductLine])
}
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/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy
similarity index 55%
copy from grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/ObjectIdPersistenceSpec.groovy
copy to grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy
index 21232bf243..5b0668d7ba 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/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy
@@ -16,34 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.grails.datastore.gorm.mongo
+package org.apache.grails.data.mongo.core
-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<GrailsDataMongoTckManager> {
-
- void setupSpec() {
- manager.addAllDomainClasses([MongoObjectIdEntity])
- }
-
- def "Test that we can persist an object that has a BSON ObjectId"() {
- when:
- def t = new MongoObjectIdEntity(name: "Bob").save(flush: true)
- manager.session.clear()
- t = MongoObjectIdEntity.get(t.id)
-
- then:
- t != null
- t.id != null
- }
-}
-
-@Entity
-class MongoObjectIdEntity {
- ObjectId id
-
- String name
+abstract class MongoDatastoreSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
}
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 4e6e92b402..bce0729e10 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<GrailsDataMongoTckManager> {
+class AggregateMethodSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 361338320d..05b089f51e 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<GrailsDataMongoTckManager> {
+class AssignedIdentifierSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 196d6321c0..0013000123 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<GrailsDataMongoTckManager> {
+class AutowireServicesSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 4629840506..2191683e50 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<GrailsDataMongoTckManager> {
+class BasicArraySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 45a490684a..7be936d359 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<GrailsDataMongoTckManager> {
+class BasicCollectionTypeSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 0a96023d3c..ae4149e4e4 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<GrailsDataMongoTckManager> {
+class BasicCollectionsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 95774aba3b..0a5d27cbfb 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.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<GrailsDataMongoTckManager> {
+class BatchUpdateDeleteSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 d3d44c1f70..beacc278f2 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<GrailsDataMongoTckManager> {
+class BeforeInsertUpdateSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 e3319d1a4e..60ef3aa8f6 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<GrailsDataMongoTckManager> {
+class BeforeUpdatePropertyPersistenceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 37ae170ef4..c97da241b1 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<GrailsDataMongoTckManager> {
+class BigDecimalSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 b71b0da4e5..02cb191762 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<GrailsDataMongoTckManager> {
+class BrokenManyToManyAssociationSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 abb2dfd9c3..3bf042e228 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<GrailsDataMongoTckManager> {
+class CascadeDeleteOneToOneSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 a230a7dc54..f2bcbd8ac3 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<GrailsDataMongoTckManager> {
+class CascadeDeleteSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 d16616add7..4a8279e465 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<GrailsDataMongoTckManager> {
+class CircularBidirectionalOneToManySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 8baee8ed11..378388c108 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<GrailsDataMongoTckManager> {
+class CircularEmbeddedListSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 5f2510f078..fa6779ca6d 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<GrailsDataMongoTckManager> {
+class CircularOneToManySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 8798e3d452..d055be480d 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<GrailsDataMongoTckManager> {
+class ClearCollectionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 f19b5418ad..2fb8e93b7c 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<GrailsDataMongoTckManager> {
+class CustomCollectionAndAttributeMappingSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 dc7aef4698..ad92eedc77 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<GrailsDataMongoTckManager> {
+class CustomIdProxySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 032774369e..d3e5448491 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<GrailsDataMongoTckManager> {
+class CustomMongoEventListenerSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 3363d3eb72..17a6f00fad 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<GrailsDataMongoTckManager> {
+class CustomTypeMarshallingSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 a7edefa90d..0aea691afb 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<GrailsDataMongoTckManager> {
+class DBObjectConversionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 dc12582bbf..9f7f35da02 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<GrailsDataMongoTckManager> {
+class DbRefWithEmbeddedSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 9497701d8f..f4f6caac60 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<GrailsDataMongoTckManager> {
+class DefaultSortOrderSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 31fcad3a9e..9f3040da03 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<GrailsDataMongoTckManager> {
+class DirtyCheckUpdateSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 7b05073fcb..e0ca371718 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<GrailsDataMongoTckManager> {
+class DisableVersionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 b895667f90..3bab2cd03d 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 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<GrailsDataMongoTckManager> {
+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 42b52b83fa..e8d53af43b 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<GrailsDataMongoTckManager> {
+class DistinctPropertySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 ac4ca60d9d..2614e7083d 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<GrailsDataMongoTckManager> {
+class DocumentMappingSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 827d83d337..316244bcaf 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<GrailsDataMongoTckManager> {
+class EmbeddedAssociationSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 30d1b0a101..a20fce4694 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<GrailsDataMongoTckManager> {
+class EmbeddedBiDirectionalSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 e89e49c881..0959103cb7 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<GrailsDataMongoTckManager> {
+class EmbeddedCollectionAndInheritanceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 c03f4cc521..990d2bdc4d 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<GrailsDataMongoTckManager> {
+class EmbeddedCollectionWithIdSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 c19af3a830..b5ed055ec1 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<GrailsDataMongoTckManager> {
+class EmbeddedCollectionWithOneToOneSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 6ed8b4461f..6b0d4b5d7a 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<GrailsDataMongoTckManager> {
+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 77c206eacd..89246a667a 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<GrailsDataMongoTckManager> {
+class EmbeddedListWithCustomTypeSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 4da5453f99..e43f6f09c3 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<GrailsDataMongoTckManager> {
+class EmbeddedMapSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 3b6687da0d..7bacd26e33 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<GrailsDataMongoTckManager> {
+class EmbeddedSetAssignedIdSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 bad5e7441a..cb0ca6a860 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<GrailsDataMongoTckManager> {
+class EmbeddedSimpleObjectSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 bf478f5e99..9db9a6dccd 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<GrailsDataMongoTckManager> {
+class EmbeddedStringListInsideEmbeddedCollectionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 c73264d067..d190ed2973 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<GrailsDataMongoTckManager> {
+class EmbeddedUnsetSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 a58a477fbb..de9add86ad 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<GrailsDataMongoTckManager> {
+class EmbeddedWhereClauseSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 e8380d7e8c..69dda852aa 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<GrailsDataMongoTckManager> {
+class EmbeddedWithCustomFieldMappingSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 ff656d07c4..99737a10e5 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<GrailsDataMongoTckManager> {
+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 50dae4f5aa..082a777083 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<GrailsDataMongoTckManager> {
+class EmbeddedWithNonEmbeddedAssociationsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 58cdbecbc4..36014cebb7 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<GrailsDataMongoTckManager> {
+class EmbeddedWithNonEmbeddedCollectionsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 73f64fe0a4..b6e46ef6e1 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<GrailsDataMongoTckManager> {
+class EmbeddedWithinEmbeddedAssociationSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 507821806e..c25613325a 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<GrailsDataMongoTckManager> {
+class EnumCollectionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 f4d4f4cadf..623550a588 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<GrailsDataMongoTckManager> {
+class EnumTypeSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 59a2c4f279..7cb315b362 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<GrailsDataMongoTckManager> {
+class EventsWithAbstractInheritanceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 0c959fcaea..0d0d5bc9c9 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Pet
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
-class FindOrCreateWhereSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+class FindOrCreateWhereSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 fe736a9e0f..f10c02f378 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<GrailsDataMongoTckManager> {
+class GeoJSONTypePersistenceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 9e1d065aa6..14bb47226f 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<GrailsDataMongoTckManager> {
+class GeospacialQuerySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 2d0ac5312d..edc8a2c6e1 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 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<GrailsDataMongoTckManager> {
+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 3cbbcc310a..ddf43b8165 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<GrailsDataMongoTckManager> {
+class GetAllWithStringIdSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 1db1c9fb6b..a4758054e9 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<GrailsDataMongoTckManager> {
+class GreaterThanAndLessThanCriteriaSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 d21a847cf9..215790547f 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<GrailsDataMongoTckManager> {
+class HasOneSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 b612d0ffbb..97d5d9906b 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.specs.Person
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
-class HintQueryArgumentSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 b0335b722a..3aa3b4caae 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 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<GrailsDataMongoTckManager> {
+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 27b36f9d28..ceb34a3374 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<GrailsDataMongoTckManager> {
+class IndexAttributesAndCompoundKeySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 7f10e17bae..8c4cd81446 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<GrailsDataMongoTckManager> {
+class IndexWithInheritanceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 99c9953cee..968197c8e9 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<GrailsDataMongoTckManager> {
+class InheritanceQueryingSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 4025fd9a7a..efa2871e18 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<GrailsDataMongoTckManager> {
+class InheritanceWithSingleEndedAssociationSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 a26fd259c6..4bfcec683d 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<GrailsDataMongoTckManager> {
+class InnerEnumSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 076cab2746..cec6d7e521 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<GrailsDataMongoTckManager> {
+class IsNullSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 40e143999d..ccdaae316b 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<GrailsDataMongoTckManager> {
+class JakartaValidationSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 16c8ff5eaf..ec800df2c1 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<GrailsDataMongoTckManager> {
+class LastUpdatedSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 851406188d..7a8a27f82f 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Pet
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
-class LikeQuerySpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 9115f42ab4..f0bdfd8e03 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<GrailsDataMongoTckManager> {
+class ListOneToManyOrderingSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 ecf5a641a8..7c743cf64f 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<GrailsDataMongoTckManager> {
+class MapOfDomainsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 3f0d3a1555..de246fbd10 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<GrailsDataMongoTckManager> {
+class MarkDirtyFalseSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 4895811410..708836c13f 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<GrailsDataMongoTckManager> {
+class MongoDynamicPropertyOnEmbeddedSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 e936d296fe..a6ec1bf679 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<GrailsDataMongoTckManager> {
+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 f3101eab44..af52cab743 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<GrailsDataMongoTckManager> {
+class MongoGormEnhancerSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 320e653b62..4ee2625fdd 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Person
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
/**
* @author Graeme Rocher
*/
-class MongoResultsListIndexSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 307f5c79e9..7e3419726f 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<GrailsDataMongoTckManager> {
+class MongoTypesSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 f702fc0de0..7822c9444f 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Person
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
-class NegateInListSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 1dfddbb042..b8122634b0 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<GrailsDataMongoTckManager> {
+class NegationEnumSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 2971f8ba9c..08a134c33d 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Pet
import grails.gorm.specs.Person
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
/**
* Tests the nullification of properties
*/
-class NullifyPropertySpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 4f81110ee5..c9fb8be0be 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<GrailsDataMongoTckManager> {
+class NullsAreNotStoredSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 21232bf243..446fd25b45 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<GrailsDataMongoTckManager> {
+class ObjectIdPersistenceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 aaa3fc6ed4..e79d64bfdd 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<GrailsDataMongoTckManager> {
+class ObjectIdPropertySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 0abd53c4b6..6c8ac16e7a 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<GrailsDataMongoTckManager> {
+class OneToManyWithInheritanceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 745bd02533..07a7c70c89 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 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.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
+
import org.bson.Document
-class OneToOneIntegritySpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 5e1bc729b1..4bc6b82454 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<GrailsDataMongoTckManager> {
+class OneToOneNoReferenceSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 cf713989d7..6fbd527709 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<GrailsDataMongoTckManager> {
+class OptimisticLockingWithExceptionSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 7e859279f5..c754abfe1f 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Plant
-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 OrderWithPaginationSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 db87433168..305c4cfeb6 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<GrailsDataMongoTckManager> {
+class ProjectionsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 9b28ee6a40..36d278702e 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<GrailsDataMongoTckManager> {
+class QueriesWithIdenticallyNamedPartsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 e26c150133..eb09e67f05 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,23 +18,23 @@
*/
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<GrailsDataMongoTckManager> {
+class ReadConcernArgumentSpec extends MongoDatastoreSpec {
void setupSpec() {
- manager.domainClasses += [grails.gorm.specs.Person]
+ manager.addAllDomainClasses([grails.gorm.specs.Person])
}
@Ignore
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 06dcd22964..a16eab284b 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<GrailsDataMongoTckManager> {
+class ReadManyObjectsSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 4fbe9ccd45..e4ff3ded4a 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Plant
-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 16/04/14.
*/
-class ResultsWithGroovyCollectionMethodsSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 2471b17242..170d096dbd 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Plant
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
-class SchemalessSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 8c8ff3bedd..80d662a5b8 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Person
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
/**
* Tests related to caching of entities.
*/
-class SessionCachingSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+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 723aa3d403..736a6c4349 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<GrailsDataMongoTckManager> {
+class SetRetrievalSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 b055357e2e..7879519146 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<GrailsDataMongoTckManager> {
+class SimpleHasManySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 79cdfeba5a..bafb0bacc4 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<GrailsDataMongoTckManager> {
+class StatelessSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 912c15cbc2..e7c8cff59d 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 org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
import grails.gorm.specs.Person
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
/**
* @author Graeme Rocher
*/
-class SwitchDatabaseAtRuntimeSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+class SwitchDatabaseAtRuntimeSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 ed3305b25d..4e4f99d441 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<GrailsDataMongoTckManager> {
+class TestSearchSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 e3f1a98aeb..d3f79584ca 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<GrailsDataMongoTckManager> {
+class TransientPropertySpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 59bec2a66a..27aab59678 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<GrailsDataMongoTckManager> {
+class WhereQueryInCriteriaSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 c563b93237..be2fbcd4b6 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<GrailsDataMongoTckManager> {
+class WriteConcernSpec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([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 93c82fbcc8..8e609d4b3b 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<GrailsDataMongoTckManager> {
+class GPMongoDB295Spec extends MongoDatastoreSpec {
void setupSpec() {
manager.addAllDomainClasses([InheritUser, ObjParent, UserGroup, User, UserObject])
}