Step 1 (PR-E): Introduce MongoDatastoreSpec base class for mongo TCK specs

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/DirtyCheckEmbeddedCollectionSpec.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/DirtyCheckEmbeddedCollectionSpec.groovy

@@ -16,14 +16,15 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
+
+import org.apache.grails.data.mongo.core.MongoDatastoreSpec
 
 import grails.persistence.Entity
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
+
 import org.bson.types.ObjectId
 
-class DirtyCheckEmbeddedCollectionSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+class DirtyCheckEmbeddedCollectionSpec extends MongoDatastoreSpec {
 
     void setupSpec() {
         manager.domainClasses.addAll([Foo, Bar])

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Face.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Face.groovy

@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
 
 import grails.persistence.Entity
 

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/FindNativeSpec.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/FindNativeSpec.groovy

@@ -16,11 +16,11 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
+
+import org.apache.grails.data.mongo.core.MongoDatastoreSpec
 
 import com.mongodb.client.FindIterable
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 import org.bson.Document
 import org.grails.datastore.gorm.mongo.Product
 //tag::nativeImport[]
@@ -31,7 +31,7 @@ import static com.mongodb.client.model.Filters.eq
 /**
  * Created by graemerocher on 24/10/16.
  */
-class FindNativeSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+class FindNativeSpec extends MongoDatastoreSpec {
 
     void setupSpec() {
         manager.domainClasses.addAll([Product])

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Nose.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Nose.groovy

@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
 
 import grails.persistence.Entity
 

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Person.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Person.groovy

@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
 
 import grails.persistence.Entity
 import groovy.transform.EqualsAndHashCode

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Pet.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Pet.groovy

@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
 
 import org.apache.grails.data.testing.tck.domains.PetType
 import grails.persistence.Entity

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/Plant.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/Plant.groovy

@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests
+package grails.gorm.specs
 
 import grails.mongodb.MongoEntity
 import grails.persistence.Entity

grails-data-mongodb/core/src/test/groovy/grails/gorm/tests/listener/PersistenceEventListenerSpec.groovy → grails-data-mongodb/core/src/test/groovy/grails/gorm/specs/listener/PersistenceEventListenerSpec.groovy

@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package grails.gorm.tests.listener
+package grails.gorm.specs.listener
+
+import org.apache.grails.data.mongo.core.MongoDatastoreSpec
 
 import grails.gorm.DetachedCriteria
 import grails.persistence.Entity
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 import org.grails.datastore.mapping.core.Datastore
 import org.grails.datastore.mapping.engine.event.AbstractPersistenceEvent
 import org.grails.datastore.mapping.engine.event.AbstractPersistenceEventListener
@@ -34,7 +34,7 @@ import org.springframework.context.ApplicationEvent
 /**
  * @author Tom Widmer
  */
-class PersistenceEventListenerSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+class PersistenceEventListenerSpec extends MongoDatastoreSpec {
     SpecPersistenceListener listener
 
     void setupSpec() {

grails-data-mongodb/core/src/test/groovy/grails/mongodb/bootstrap/FailOnErrorSetupSpec.groovy

@@ -18,13 +18,12 @@
  */
 package grails.mongodb.bootstrap
 
-import grails.gorm.tests.Plant
+import grails.gorm.specs.Plant
 import org.apache.grails.testing.mongo.AutoStartedMongoSpec
 import org.grails.datastore.mapping.config.Settings
 import org.grails.datastore.mapping.mongo.MongoDatastore
 import spock.lang.AutoCleanup
 import spock.lang.Shared
-import spock.lang.Specification
 
 /**
  * Created by graemerocher on 16/12/16.

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.domainClasses.addAll([Product, ProductLine])
     }

grails-data-mongodb/core/src/test/groovy/org/apache/grails/data/mongo/core/MongoDatastoreSpec.groovy

@@ -0,0 +1,24 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.grails.data.mongo.core
+
+import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
+
+abstract class MongoDatastoreSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+}

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.domainClasses.addAll([City])
     }

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.domainClasses.addAll([River, Lake, Volcano])
     }

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.domainClasses.addAll([Pizza])
     }

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.domainClasses.addAll([Data])
     }

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.domainClasses.addAll([MyCollections])

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.domainClasses.addAll([Linguist, Increment])
     }

grails-data-mongodb/core/src/test/groovy/org/grails/datastore/gorm/mongo/BatchUpdateDeleteSpec.groovy

@@ -19,18 +19,18 @@
 
 package org.grails.datastore.gorm.mongo
 
+import org.apache.grails.data.mongo.core.MongoDatastoreSpec
+
 import grails.gorm.annotation.Entity
-import grails.gorm.tests.Plant
+import grails.gorm.specs.Plant
 import grails.mongodb.MongoEntity
-import org.apache.grails.data.mongo.core.GrailsDataMongoTckManager
-import org.apache.grails.data.testing.tck.base.GrailsDataTckSpec
 import org.grails.datastore.gorm.query.transform.ApplyDetachedCriteriaTransform
 
 /**
  * Created by graemerocher on 20/03/14.
  */
 @ApplyDetachedCriteriaTransform
-class BatchUpdateDeleteSpec extends GrailsDataTckSpec<GrailsDataMongoTckManager> {
+class BatchUpdateDeleteSpec extends MongoDatastoreSpec {
 
     void setupSpec() {
         manager.domainClasses.addAll([BatchUser, BatchAddress, Plant])

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.domainClasses.addAll([BeforeInsertUser])
     }

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.domainClasses.addAll([UserWithBeforeUpdate, UserWithBeforeUpdateAndAutoTimestamp])

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.domainClasses.addAll([BossMan])

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.domainClasses.addAll([ReferencingEntity, ReferencedEntity])

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.domainClasses.addAll([SystemUser, UserSettings, Company, Executive, Employee])
     }