Merge branch 'newMongoMerge' of https://github.com/jdaugherty/grails-data-mapping into newMongoMerge

Author: jamesfredley

grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec.groovy

@@ -2,9 +2,10 @@ package grails.gorm.tck
 
 import grails.gorm.tests.GormDatastoreSpec
 import org.grails.datastore.mapping.proxy.ProxyHandler
+import spock.lang.PendingFeatureIf
 
 class BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec extends GormDatastoreSpec {
-
+    @PendingFeatureIf({ !Boolean.getBoolean("hibernate5.gorm.suite") && !Boolean.getBoolean("hibernate6.gorm.suite")})
     void "test unique constraint on root instance"() {
 
         setup:
@@ -25,6 +26,7 @@ class BuiltinUniqueConstraintWorksWithTargetProxiesConstraintsSpec extends GormD
         ContactDetails.deleteAll(contactDetails1)
     }
 
+    @PendingFeatureIf({ !Boolean.getBoolean("hibernate5.gorm.suite") && !Boolean.getBoolean("hibernate6.gorm.suite")})
     void "test unique constraint for the associated child object"() {
 
         setup:

grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DirtyCheckingAfterListenerSpec.groovy

@@ -10,6 +10,8 @@ import org.grails.datastore.mapping.engine.event.PreUpdateEvent
 import org.springframework.context.ApplicationEvent
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.context.ConfigurableApplicationContext
+import spock.lang.IgnoreIf
+import spock.lang.PendingFeatureIf
 import spock.util.concurrent.PollingConditions
 
 class DirtyCheckingAfterListenerSpec extends GormDatastoreSpec {
@@ -33,6 +35,7 @@ class DirtyCheckingAfterListenerSpec extends GormDatastoreSpec {
         }
     }
 
+    @PendingFeatureIf({ !Boolean.getBoolean("hibernate5.gorm.suite") && !Boolean.getBoolean("hibernate6.gorm.suite")})
     void "test state change from listener update the object"() {
 
         when:

grails-datastore-gorm-tck/src/main/groovy/grails/gorm/tck/DirtyCheckingSpec.groovy

@@ -3,6 +3,7 @@ package grails.gorm.tck
 import grails.gorm.tests.GormDatastoreSpec
 import org.grails.datastore.mapping.proxy.ProxyHandler
 import spock.lang.IgnoreIf
+import spock.lang.PendingFeature
 
 /**
  * @author Graeme Rocher
@@ -151,7 +152,7 @@ class DirtyCheckingSpec extends GormDatastoreSpec {
         TestAuthor.deleteAll()
     }
 
-    @IgnoreIf({ Boolean.getBoolean("hibernate5.gorm.suite") || Boolean.getBoolean("hibernate6.gorm.suite")}) // because one-to-one association loads eagerly in the Hibernate
+    @PendingFeature // because one-to-one association loads eagerly in the Hibernate
     void "test initialized proxy is not marked as dirty"() {
 
         given: