restore domain inheritance tests

jamesfredley · jamesfredley · commit a9fa7462f985 · 2024-10-25T17:17:56.000-04:00
diff --git a/examples/grails3-hibernate5/grails-app/domain/functional/tests/Employee.groovy b/examples/grails3-hibernate5/grails-app/domain/functional/tests/Employee.groovy
@@ -1,7 +1,6 @@
 package functional.tests
 
-// TODO domain inheritance
-class Employee /*extends Person*/ {
+class Employee extends Person {
 
     static belongsTo = [
             business: Business
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/SubclassMultipleListCollectionSpec.groovy
@@ -47,8 +47,7 @@ class Iteration {
 //    static mappedBy = [products: 'iteration', otherProducts: 'none']
 }
 
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Product extends SuperProduct {
 
     static belongsTo = [iteration: Iteration]
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/TablePerSubClassAndEmbeddedSpec.groovy
@@ -73,8 +73,7 @@ class Company {
         tablePerSubclass  true
     }
 }
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Vendor extends Company {
 
     static constraints = {
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/SubclassToOneProxySpec.groovy
@@ -27,8 +27,7 @@ class SubclassToOneProxySpec extends GormDatastoreSpec {
 class SuperclassProxy {
 }
 
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class SubclassProxy extends SuperclassProxy {
 }
 
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/inheritance/TablePerConcreteClassAndDateCreatedSpec.groovy
@@ -51,8 +51,7 @@ abstract class Vehicle {
     }
 }
 
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Spaceship extends Vehicle {
     static mapping = {
         dynamicUpdate true
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/CascadeValidationSpec.groovy
@@ -50,8 +50,7 @@ abstract class Person {
 
 }
 
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Employee extends Person {
 
     static belongsTo = [
diff --git a/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy b/grails-datastore-gorm-hibernate5/src/test/groovy/grails/gorm/tests/validation/UniqueInheritanceSpec.groovy
@@ -70,8 +70,7 @@ class Item {
     Product product
 }
 
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class ConcreteProduct extends Product {
 
 }
diff --git a/grails-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy b/grails-plugin/src/test/groovy/grails/test/mixin/hibernate/HibernateSpecSpec.groovy
@@ -60,8 +60,7 @@ class Person {
         phone nullable: true
     }
 }
-// @Entity
-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>
+@Entity
 class Player extends Person {
     String sport
     String height

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ class Iteration {`
`47`	`47`	`// static mappedBy = [products: 'iteration', otherProducts: 'none']`
`48`	`48`	`}`
`49`	`49`
`50`		`-// @Entity`
`51`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`50`	`+@Entity`
`52`	`51`	`class Product extends SuperProduct {`
`53`	`52`
`54`	`53`	`static belongsTo = [iteration: Iteration]`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,7 @@ class Company {`
`73`	`73`	`tablePerSubclass true`
`74`	`74`	`}`
`75`	`75`	`}`
`76`		`-// @Entity`
`77`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`76`	`+@Entity`
`78`	`77`	`class Vendor extends Company {`
`79`	`78`
`80`	`79`	`static constraints = {`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ class SubclassToOneProxySpec extends GormDatastoreSpec {`
`27`	`27`	`class SuperclassProxy {`
`28`	`28`	`}`
`29`	`29`
`30`		`-// @Entity`
`31`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`30`	`+@Entity`
`32`	`31`	`class SubclassProxy extends SuperclassProxy {`
`33`	`32`	`}`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ abstract class Vehicle {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`-// @Entity`
`55`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`54`	`+@Entity`
`56`	`55`	`class Spaceship extends Vehicle {`
`57`	`56`	`static mapping = {`
`58`	`57`	`dynamicUpdate true`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@ abstract class Person {`
`50`	`50`
`51`	`51`	`}`
`52`	`52`
`53`		`-// @Entity`
`54`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`53`	`+@Entity`
`55`	`54`	`class Employee extends Person {`
`56`	`55`
`57`	`56`	`static belongsTo = [`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,7 @@ class Item {`
`70`	`70`	`Product product`
`71`	`71`	`}`
`72`	`72`
`73`		`-// @Entity`
`74`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`73`	`+@Entity`
`75`	`74`	`class ConcreteProduct extends Product {`
`76`	`75`
`77`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ class Person {`
`60`	`60`	`phone nullable: true`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`-// @Entity`
`64`		`-// https://issues.apache.org/jira/browse/GROOVY-5106 - The interface GormEntity cannot be implemented more than once with different arguments: org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX> and org.grails.datastore.gorm.GormEntity<grails.gorm.tests.XXX>`
	`63`	`+@Entity`
`65`	`64`	`class Player extends Person {`
`66`	`65`	`String sport`
`67`	`66`	`String height`