GRAILS-6405

Author: burtbeckwith

src/java/org/codehaus/groovy/grails/compiler/injection/GrailsASTUtils.java

@@ -114,8 +114,8 @@ public static String getFullName(ClassNode classNode) {
     public static ClassNode getFurthestParent(ClassNode classNode) {
         ClassNode parent = classNode.getSuperClass();
         while (parent != null && !getFullName(parent).equals("java.lang.Object")) {
-            parent = parent.getSuperClass();
             classNode = parent;
+            parent = parent.getSuperClass();
         }
         return classNode;
     }

src/test/org/codehaus/groovy/grails/compiler/injection/GrailsASTUtilsTests.groovy

@@ -0,0 +1,25 @@
+package org.codehaus.groovy.grails.compiler.injection
+
+import org.codehaus.groovy.ast.ClassNode
+
+/**
+ * @author Burt Beckwith
+ */
+class GrailsASTUtilsTests extends GroovyTestCase {
+    
+    void testGetFurthestParent() {
+        def fooNode = new ClassNode(Foo)
+        def barNode = new ClassNode(Bar)
+        def bazNode = new ClassNode(Baz)
+        
+        assertEquals Foo.name, GrailsASTUtils.getFurthestParent(fooNode).name
+        assertEquals Foo.name, GrailsASTUtils.getFurthestParent(barNode).name
+        assertEquals Foo.name, GrailsASTUtils.getFurthestParent(bazNode).name
+    }
+}
+
+class Foo {}
+
+class Bar extends Foo {}
+
+class Baz extends Bar {}

src/test/org/codehaus/groovy/grails/orm/hibernate/IdInheritanceTests.groovy

@@ -7,18 +7,17 @@ package org.codehaus.groovy.grails.orm.hibernate
 class IdInheritanceTests extends AbstractGrailsHibernateTests {
 
     protected void onSetUp() {
-        gcl.parseClass('''
+        gcl.parseClass '''
 import grails.persistence.*
 
+abstract class GrandParent {}
+
 @Entity
-abstract class Parent {
+abstract class Parent extends GrandParent {
   String toString() {
     return "${id}"
   }
 }
-''')
-        gcl.parseClass('''
-import grails.persistence.*
 
 @Entity
 class Child extends Parent {
@@ -29,8 +28,7 @@ class Child extends Parent {
     return super.id
   }
 }
-
-''')
+'''
     }