ROASTER-5: Added addParameter(JavaType, String) method

forge · Apr 7, 2014 · ea46069 · ea46069
1 parent f66b742
commit ea46069
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/api/src/main/java/org/jboss/forge/roaster/model/source/MethodSource.java b/api/src/main/java/org/jboss/forge/roaster/model/source/MethodSource.java
@@ -95,6 +95,11 @@ public interface MethodSource<O extends JavaSource<O>> extends Method<O, MethodS
     */
    ParameterSource<O> addParameter(String type, String name);
 
+   /**
+    * Add a parameter with the specified {@link JavaType} type and name to this method
+    */
+   ParameterSource<O> addParameter(JavaType<?> type, String name);
+
    /**
     * Remove a parameter from this method
     */

diff --git a/impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java b/impl/src/main/java/org/jboss/forge/roaster/model/impl/MethodImpl.java
@@ -653,6 +653,12 @@ public ParameterSource<O> addParameter(Class<?> type, String name)
       return addParameter(type.getName(), name);
    }
 
+   @Override
+   public ParameterSource<O> addParameter(JavaType<?> type, String name)
+   {
+      return addParameter(type.getQualifiedName(), name);
+   }
+
    @SuppressWarnings("unchecked")
    @Override
    public ParameterSource<O> addParameter(String type, String name)

diff --git a/impl/src/test/java/org/jboss/forge/test/roaster/model/JavaClassMethodTest.java b/impl/src/test/java/org/jboss/forge/test/roaster/model/JavaClassMethodTest.java
@@ -8,6 +8,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
@@ -18,7 +19,6 @@
 import org.jboss.forge.roaster.model.source.MemberSource;
 import org.jboss.forge.roaster.model.source.MethodSource;
 import org.jboss.forge.roaster.model.source.ParameterSource;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -130,25 +130,35 @@ public void testGetMembers() throws Exception
    public void testAddParameter() throws Exception
    {
       ParameterSource<JavaClassSource> param = method.addParameter(Number.class, "number");
-      Assert.assertNotNull(param);
-      Assert.assertEquals(3, method.getParameters().size());
+      assertNotNull(param);
+      assertEquals(3, method.getParameters().size());
    }
 
    @Test
    public void testAddParameterStringType() throws Exception
    {
       ParameterSource<JavaClassSource> param = method.addParameter(Number.class.getName(), "number");
-      Assert.assertNotNull(param);
-      Assert.assertEquals(3, method.getParameters().size());
+      assertNotNull(param);
+      assertEquals(3, method.getParameters().size());
+   }
+
+   @Test
+   public void testAddParameterJavaType() throws Exception
+   {
+      JavaClassSource type = Roaster.create(JavaClassSource.class).setName("Mock").setPackage("mock.pkg");
+      ParameterSource<JavaClassSource> param = method.addParameter(type, "mock");
+      assertNotNull(param);
+      assertEquals(3, method.getParameters().size());
+      assertTrue(method.getOrigin().hasImport(type));
    }
 
    @Test
    public void testRemoveParameter() throws Exception
    {
       ParameterSource<JavaClassSource> param = method.getParameters().get(0);
-      Assert.assertNotNull(param);
+      assertNotNull(param);
       method.removeParameter(param);
-      Assert.assertEquals(1, method.getParameters().size());
+      assertEquals(1, method.getParameters().size());
    }
 
 }