Skip to content

Commit e5b76a2

Browse files
committed
changed names of classes to avoid conflicts
1 parent 9e367f1 commit e5b76a2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/test/org/codehaus/groovy/grails/web/converters/ConvertsWithHibernateProxiesTests.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ class ConvertsWithHibernateProxiesTests extends AbstractGrailsHibernateTests {
1313
import grails.persistence.*
1414
1515
@Entity
16-
class Parent {
16+
class ConvertsWithHibernateProxiesParent {
1717
18-
static hasMany = [children:Child]
18+
static hasMany = [children:ConvertsWithHibernateProxiesChild]
1919
2020
String name = "Bob"
2121
@@ -24,9 +24,9 @@ class Parent {
2424
}
2525
2626
@Entity
27-
class Child {
27+
class ConvertsWithHibernateProxiesChild {
2828
29-
static belongsTo = [parent: Parent]
29+
static belongsTo = [parent: ConvertsWithHibernateProxiesParent]
3030
3131
String name = "Bob Junior"
3232
@@ -38,8 +38,8 @@ class Child {
3838
}
3939

4040
void testMarshDomainModelContainingProxiesToJSON() {
41-
def Parent = ga.getDomainClass("Parent").clazz
42-
def Child = ga.getDomainClass("Child").clazz
41+
def Parent = ga.getDomainClass("ConvertsWithHibernateProxiesParent").clazz
42+
def Child = ga.getDomainClass("ConvertsWithHibernateProxiesChild").clazz
4343
def parent = Parent.newInstance()
4444
def child = Child.newInstance()
4545
parent.addToChildren child
@@ -59,8 +59,8 @@ class Child {
5959
}
6060

6161
void testMarshDomainModelContainingProxiesToXML() {
62-
def Parent = ga.getDomainClass("Parent").clazz
63-
def Child = ga.getDomainClass("Child").clazz
62+
def Parent = ga.getDomainClass("ConvertsWithHibernateProxiesParent").clazz
63+
def Child = ga.getDomainClass("ConvertsWithHibernateProxiesChild").clazz
6464
def parent = Parent.newInstance()
6565
def child = Child.newInstance()
6666
parent.addToChildren child

0 commit comments

Comments
 (0)