fix for GRAILS-670

git-svn-id: https://svn.codehaus.org/grails/trunk@3087 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/persistence/org/codehaus/groovy/grails/metaclass/AddRelatedDynamicMethod.java

@@ -57,7 +57,7 @@ public Object invoke(Object target, String methodName, Object[] arguments) {
         if(arguments[0] == null) {
         	throw new IllegalArgumentException("Argument to ["+ this.methodName +"] cannot be null");
         }
-        if(!arguments[0].getClass().equals(property.getReferencedPropertyType())) {
+        if(!property.getReferencedPropertyType().isAssignableFrom(arguments[0].getClass())) {
            throw new MissingMethodException(this.methodName,target.getClass(),arguments);
         }
 

test/persistence/org/codehaus/groovy/grails/domain/AddRelatedDynamicMethodTests.java

@@ -41,70 +41,28 @@
 public class AddRelatedDynamicMethodTests extends TestCase {
 
     public void testInvoke() throws Exception {
-       GroovyClassLoader gcl = new GroovyClassLoader();
-       gcl.parseClass("class Book {\n" +
-                                    "\tLong id\n" +
-                                    "\tLong version\n" +
-                                    "\n" +
-                                    "\tAuthor author\n" +
-                                    "}\n" +
-                                    "class Author {\n" +
-                                    "\tLong id\n" +
-                                    "\tLong version\n" +
-                                    "\tdef relatesToMany = [books:Book]\n" +
-                                    "\tSet books\n" +
-                                    "}");
-
-
-        GroovyObject book = (GroovyObject)gcl.loadClass("Book",false,true).newInstance();
-        GroovyObject author = (GroovyObject)gcl.loadClass("Author",false,true).newInstance();
-
-        GrailsApplication ga = new DefaultGrailsApplication(new Class[]{book.getClass(),author.getClass()},gcl);
-        GrailsDomainClass authorDC = ga.getGrailsDomainClass("Author");
-
-        AbstractAddRelatedDynamicMethod ardm = new AddRelatedDynamicMethod(authorDC.getPropertyByName("books"));
-
-        try {
-            ardm.invoke(author, "addBook", new Object[0]);
-            fail("Should have thrown missing method exception!");
-        } catch (MissingMethodException e) {
-            // expected
-        }
-
-        try {
-            ardm.invoke(author, "addBook", new Object[]{"blah"});
-            fail("Should have thrown missing method exception!");
-        } catch (MissingMethodException e) {
-            // expected
-        }
-
-        ardm.invoke(author, "addBook", new Object[]{book});
-
-        assertEquals(author,book.getProperty("author"));
-        Set books = (Set)author.getProperty("books");
-        assertNotNull(books);
-        assertEquals(1,books.size());
-        assertTrue(books.contains(book));
-    }
-
-    public void testInvokeWithSortedSet() throws Exception {
         GroovyClassLoader gcl = new GroovyClassLoader();
-        gcl.parseClass("class Book implements Comparable {\n" +
+        gcl.parseClass("class Book {\n" +
                                      "\tLong id\n" +
                                      "\tLong version\n" +
                                      "\n" +
                                      "\tAuthor author\n" +
-                                     "int compareTo(other) { 1 }" +
                                      "}\n" +
                                      "class Author {\n" +
                                      "\tLong id\n" +
                                      "\tLong version\n" +
                                      "\tdef relatesToMany = [books:Book]\n" +
-                                     "\tSortedSet books\n" +
-                                     "}");
+                                     "\tSet books\n" +
+                                     "}\n"+
+                                     "class SubBook extends Book{\n" +
+                                     "\tString subtitle\n" +
+                                     "\n" +
+                                     "}"
+                                     );
 
 
          GroovyObject book = (GroovyObject)gcl.loadClass("Book",false,true).newInstance();
+         GroovyObject subbook = (GroovyObject)gcl.loadClass("SubBook",false,true).newInstance();
          GroovyObject author = (GroovyObject)gcl.loadClass("Author",false,true).newInstance();
 
          GrailsApplication ga = new DefaultGrailsApplication(new Class[]{book.getClass(),author.getClass()},gcl);
@@ -113,24 +71,74 @@ public void testInvokeWithSortedSet() throws Exception {
          AbstractAddRelatedDynamicMethod ardm = new AddRelatedDynamicMethod(authorDC.getPropertyByName("books"));
 
          try {
-             ardm.invoke(author, "addBook", new Object[0]);
+             ardm.invoke(author,"addAuthor",new Object[0]);
              fail("Should have thrown missing method exception!");
          } catch (MissingMethodException e) {
              // expected
          }
 
          try {
-             ardm.invoke(author, "addBook", new Object[]{"blah"});
+             ardm.invoke(author,"addAuthor",new Object[]{"blah"});
              fail("Should have thrown missing method exception!");
          } catch (MissingMethodException e) {
              // expected
          }
 
-         ardm.invoke(author, "addBook", new Object[]{book});
-
+         ardm.invoke(author,"addAuthor", new Object[]{book});
+         ardm.invoke(author,"addAuthor", new Object[]{subbook});
+         
          assertEquals(author,book.getProperty("author"));
-         SortedSet books = (SortedSet)author.getProperty("books");
+         Set books = (Set)author.getProperty("books");
          assertNotNull(books);
+         assertEquals(2,books.size());
+         assertTrue(books.contains(book));
+     }
+
+     public void testInvokeWithSortedSet() throws Exception {
+         GroovyClassLoader gcl = new GroovyClassLoader();
+         gcl.parseClass("class Book implements Comparable {\n" +
+                                      "\tLong id\n" +
+                                      "\tLong version\n" +
+                                      "\n" +
+                                      "\tAuthor author\n" +
+                                      "int compareTo(other) { 1 }" +
+                                      "}\n" +
+                                      "class Author {\n" +
+                                      "\tLong id\n" +
+                                      "\tLong version\n" +
+                                      "\tdef relatesToMany = [books:Book]\n" +
+                                      "\tSortedSet books\n" +
+                                      "}");
+
+
+          GroovyObject book = (GroovyObject)gcl.loadClass("Book",false,true).newInstance();
+          GroovyObject author = (GroovyObject)gcl.loadClass("Author",false,true).newInstance();
+
+          GrailsApplication ga = new DefaultGrailsApplication(new Class[]{book.getClass(),author.getClass()},gcl);
+          GrailsDomainClass authorDC = ga.getGrailsDomainClass("Author");
+
+          AbstractAddRelatedDynamicMethod ardm = new AddRelatedDynamicMethod(authorDC.getPropertyByName("books"));
+
+          try {
+              ardm.invoke(author,"addAuthor",new Object[0]);
+              fail("Should have thrown missing method exception!");
+          } catch (MissingMethodException e) {
+              // expected
+          }
+
+          try {
+              ardm.invoke(author,"addAuthor",new Object[]{"blah"});
+              fail("Should have thrown missing method exception!");
+          } catch (MissingMethodException e) {
+              // expected
+          }
+
+          ardm.invoke(author, "addAuthor",new Object[]{book});
+
+          assertEquals(author,book.getProperty("author"));
+          SortedSet books = (SortedSet)author.getProperty("books");
+          assertNotNull(books);
+
+     }
 
-    }
 }