Rerun related GORM domain inheritance tests

rainboyan · rainboyan · commit 7b0aa2a05beb · 2024-12-19T09:37:52.000+08:00
Closes gh-27
diff --git a/grace-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingInheritanceTests.groovy b/grace-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingInheritanceTests.groovy
@@ -1,7 +1,5 @@
 package org.grails.datastore.mapping.model
 
-import org.junit.jupiter.api.Disabled
-
 import grails.gorm.annotation.Entity
 import org.grails.datastore.mapping.model.types.*
 import org.junit.jupiter.api.Test
@@ -11,7 +9,6 @@ import static org.junit.jupiter.api.Assertions.*
 /**
  * Tests for correct mapping of entities with inheritance.
  */
-@Disabled("https://issues.apache.org/jira/browse/GROOVY-5106")
 class GormMappingInheritanceTests {
 
     @Test
@@ -104,14 +101,14 @@ class GormMappingInheritanceTests {
     }
 }
 
-//@Entity
+@Entity
 class DerivedEntity extends SecondEntity {
     String baz
 
     static transients = ['baz']
 }
 
-//@Entity
+@Entity
 class SpecialUser extends User {
     Set specialFriends
 
@@ -129,7 +126,7 @@ class Parent {
     static hasMany = [children: BaseChild]
 }
 
-//@Entity
+@Entity
 class BaseChild {
     Long id
 
@@ -143,7 +140,7 @@ class DerivedChild extends BaseChild {
     String prop
 }
 
-//@Entity
+@Entity
 class EmbeddedTest {
     Long id
 
@@ -158,7 +155,7 @@ class DerivedEmbeddedTest extends EmbeddedTest {
     static embedded = ['testEntity2']
 }
 
-//@Entity
+@Entity
 class MappingTest {
     Long id
 
@@ -169,7 +166,7 @@ class MappingTest {
     }
 }
 
-//@Entity
+@Entity
 class MappingTest2 extends MappingTest {
 
     String toIndex2
diff --git a/grace-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingSyntaxTests.groovy b/grace-datastore-core/src/test/groovy/org/grails/datastore/mapping/model/GormMappingSyntaxTests.groovy
@@ -203,7 +203,7 @@ class TestEntity {
     static transients = ['bar']
 }
 
-//@Entity
+@Entity
 class SecondEntity {
     Long id
     String name
diff --git a/grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/InheritanceSpec.groovy b/grace-datastore-gorm-tck/src/main/groovy/grails/gorm/tests/InheritanceSpec.groovy
@@ -1,13 +1,10 @@
 package grails.gorm.tests
 
-import spock.lang.Ignore
-
 import grails.persistence.Entity
 
 /**
  * @author graemerocher
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class InheritanceSpec extends GormDatastoreSpec {
 
     @Override
@@ -100,7 +97,7 @@ class Practice implements Serializable {
     static hasMany = [locations: Location]
 }
 
-//@Entity
+@Entity
 class Location implements Serializable {
 //    Long id
     Long version
diff --git a/grace-datastore-gorm-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy b/grace-datastore-gorm-test/src/test/groovy/grails/gorm/services/ServiceImplSpec.groovy
@@ -1,11 +1,8 @@
 package grails.gorm.services
 
-import spock.lang.Ignore
-
 import grails.gorm.annotation.Entity
 import grails.gorm.validation.PersistentEntityValidator
 import grails.validation.ValidationException
-import groovy.json.JsonOutput
 import org.grails.datastore.gorm.validation.constraints.eval.DefaultConstraintEvaluator
 import org.grails.datastore.gorm.validation.constraints.registry.DefaultConstraintRegistry
 import org.grails.datastore.gorm.validation.constraints.registry.DefaultValidatorRegistry
@@ -18,7 +15,6 @@ import spock.lang.Specification
 /**
  * Created by graemerocher on 06/02/2017.
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class ServiceImplSpec extends Specification {
 
     @AutoCleanup SimpleMapDatastore datastore = new SimpleMapDatastore(
@@ -321,11 +317,11 @@ class ServiceImplSpec extends Specification {
 
         ProductInfo info = productService.findProductInfo("Pumpkin", "Vegetable")
         List<ProductInfo> infos = productService.findProductInfos( "Vegetable")
-        def result = JsonOutput.toJson(info)
+
         then:
         infos.size() == 2
         infos.first().name == "Carrot"
-        result == '{"name":"Pumpkin"}'
+
         info != null
         info.name == "Pumpkin"
         productService.searchProductInfoByName("Pump%") != null
@@ -373,7 +369,7 @@ interface ProductInfo {
 }
 
 @Entity
-class Product {
+class Product implements ProductInfo {
     String name
     String type
 
diff --git a/grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BidirectionalOneToManyWithInheritanceSpec.groovy b/grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/BidirectionalOneToManyWithInheritanceSpec.groovy
@@ -1,14 +1,11 @@
 package org.grails.datastore.gorm
 
-import spock.lang.Ignore
-
 import grails.gorm.tests.GormDatastoreSpec
 import grails.persistence.Entity
 
 /**
  * @author graemerocher
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class BidirectionalOneToManyWithInheritanceSpec extends GormDatastoreSpec {
 
     void "Test a bidirectional one-to-many association with inheritance"() {
@@ -34,7 +31,7 @@ class BidirectionalOneToManyWithInheritanceSpec extends GormDatastoreSpec {
     }
 }
 
-//@Entity
+@Entity
 class ConfigurationItem {
     Long id
     Long version
diff --git a/grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy b/grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/InheritanceWithOneToManySpec.groovy
@@ -1,13 +1,10 @@
 package org.grails.datastore.gorm
 
-import spock.lang.Ignore
-
 import grails.gorm.tests.GormDatastoreSpec
 import grails.persistence.Entity
 
 import spock.lang.Issue
 
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class InheritanceWithOneToManySpec extends GormDatastoreSpec{
 
     @Issue('GRAILS-9010')
@@ -38,7 +35,7 @@ class Group {
     Collection members
 }
 
-//@Entity
+@Entity
 class Member   {
     Long id
     String name
diff --git a/grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/validation/UniqueConstraintSpec.groovy b/grace-datastore-gorm-test/src/test/groovy/org/grails/datastore/gorm/validation/UniqueConstraintSpec.groovy
@@ -14,7 +14,6 @@ import spock.lang.AutoCleanup
 import spock.lang.Specification
 
 @Transactional
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class UniqueConstraintSpec extends Specification {
 
     @AutoCleanup SimpleMapDatastore datastore = new SimpleMapDatastore(
@@ -145,7 +144,7 @@ class UniqueConstraintSpec extends Specification {
 }
 
 
-//@Entity
+@Entity
 class Channel {
 
     String name
@@ -177,7 +176,7 @@ class ListChannel extends Channel {
 }
 
 
-//@Entity
+@Entity
 class OtherListChannel extends ListChannel {
 
     static constraints = {
diff --git a/grace-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/EntityWithGenericSignaturesSpec.groovy b/grace-datastore-gorm/src/test/groovy/org/grails/compiler/gorm/EntityWithGenericSignaturesSpec.groovy
@@ -1,17 +1,13 @@
 package org.grails.compiler.gorm
 
-import spock.lang.Ignore
-
 import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext
-import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValuePersistentEntity
 import org.grails.datastore.mapping.model.MappingContext
 import org.grails.datastore.mapping.model.PersistentEntity
 import spock.lang.Specification
 
 /**
  * Created by graemerocher on 16/09/2016.
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class EntityWithGenericSignaturesSpec extends Specification {
 
     void "Test compile entity with generic signatures"() {
@@ -35,7 +31,7 @@ abstract class WidgetSetting {
      String name
 }
 
-//@Entity
+@Entity
 class HotWidgetSetting extends WidgetSetting {
     Integer temperature
 }
diff --git a/grace-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/dirty/checking/DirtyCheckTransformationSpec.groovy b/grace-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/dirty/checking/DirtyCheckTransformationSpec.groovy
@@ -10,7 +10,6 @@ import spock.lang.Issue
 /**
  * @author Graeme Rocher
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class DirtyCheckTransformationSpec extends Specification {
     @Issue('https://github.com/grails/grails-data-mapping/issues/894')
     void "Test transform doesn't make getters require static compilation"() {
diff --git a/grace-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/model/TransientInheritanceSpec.groovy b/grace-datastore-gorm/src/test/groovy/org/grails/datastore/gorm/model/TransientInheritanceSpec.groovy
@@ -1,7 +1,5 @@
 package org.grails.datastore.gorm.model
 
-import spock.lang.Ignore
-
 import grails.gorm.annotation.Entity
 import org.grails.datastore.mapping.keyvalue.mapping.config.KeyValueMappingContext
 import org.grails.datastore.mapping.model.MappingContext
@@ -11,7 +9,6 @@ import spock.lang.Specification
 /**
  * Created by graemerocher on 03/11/16.
  */
-@Ignore("https://issues.apache.org/jira/browse/GROOVY-5106")
 class TransientInheritanceSpec extends Specification {
 
     void "test inherit transient config from abstract non-entity parent"() {
@@ -20,7 +17,7 @@ class TransientInheritanceSpec extends Specification {
         PersistentEntity entity = mappingContext.addPersistentEntity(Child)
 
         expect:
-        entity.persistentPropertyNames == ['foo', 'one']
+        entity.persistentPropertyNames.sort() == ['foo', 'one']
     }
 
     static abstract class Parent {
@@ -29,7 +26,7 @@ class TransientInheritanceSpec extends Specification {
         static transients = ['bar']
     }
 
-//    @Entity
+    @Entity
     static class Child extends Parent{
 
         String one

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ class TestEntity {`
`203`	`203`	`static transients = ['bar']`
`204`	`204`	`}`
`205`	`205`
`206`		`-//@Entity`
	`206`	`+@Entity`
`207`	`207`	`class SecondEntity {`
`208`	`208`	`Long id`
`209`	`209`	`String name`