Merge pull request #25 from Hi-Fi/general_varargs

Fixes #12

Author: Hi-Fi

src/main/java/org/robotframework/javalib/reflection/ArgumentCollector.java

@@ -1,5 +1,6 @@
 package org.robotframework.javalib.reflection;
 
+import java.lang.reflect.Array;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -35,7 +36,7 @@ public List collectArguments(List args, Map<String, Object> kwargs) {
                 boolean kwarg = parameterName.contains("**");
                 parameterName = parameterName.replace("*", "").replace("*", "");
                 Object value = this.getParameterValue(parameterName, i, args, cleanedKwargs);
-                Class<?> argumentType = parameterTypes.length > i && !vararg ? parameterTypes[i] : String.class;
+                Class<?> argumentType = parameterTypes.length > i && !vararg ? parameterTypes[i] : Object.class;
                 if (!kwarg) {
                     if (vararg) {
                         if (value != null) {
@@ -83,8 +84,14 @@ private Object getParameterValue(String parameterName, int i, List args, Map<Str
     }
 
     private Object ensureCorrectVarargsType(List varargs) {
-        if (parameterTypes != null && parameterTypes.length > 0 && parameterTypes[parameterTypes.length-1].isArray() || (parameterTypes.length > 1 && parameterTypes[parameterTypes.length-2].isArray())) {
-            return varargs.toArray(new String[0]);
+        int varargIndex = this.getVarargsIndex();
+        if (parameterTypes != null && varargIndex > -1 && parameterTypes[varargIndex].isArray()) {
+            Class<?> arrayClass = parameterTypes[varargIndex].getComponentType();
+            Object[] varargsArray = (Object[]) Array.newInstance(arrayClass, varargs.size());
+            for (int i = 0; i < varargs.size(); i++) {
+                varargsArray[i] = varargs.get(i);
+            }
+            return varargsArray;
         } else {
             return varargs;
         }

src/test/java/org/robotframework/javalib/reflection/ArgumentCollectorTest.java

@@ -35,4 +35,30 @@ void namedArguments() {
         assertTrue(collectedArgs.size() == 3);
         assertTrue(collectedArgs.get(2) instanceof Map);
     }
+
+    @Test
+    void varargsTypeInt() {
+        List providedArguments = Arrays.asList("arg", "*varargs");
+        Class<?>[] argumentTypes = new Class[] { String.class, Integer[].class};
+        IArgumentCollector collector = new ArgumentCollector(argumentTypes, providedArguments);
+        List<Integer> args = Arrays.asList(2, 3, 4);
+        List collectedArgs = collector.collectArguments(args, null);
+        assertEquals(2, collectedArgs.size());
+        assertTrue(collectedArgs.get(1).getClass().isArray());
+        assertEquals(((Integer[])collectedArgs.get(1))[0].getClass(), Integer.class);
+        assertEquals(((Integer[])collectedArgs.get(1))[1].getClass(), Integer.class);
+    }
+
+    @Test
+    void varargsTypeString() {
+        List providedArguments = Arrays.asList("arg", "*varargs");
+        Class<?>[] argumentTypes = new Class[] { String.class, String[].class};
+        IArgumentCollector collector = new ArgumentCollector(argumentTypes, providedArguments);
+        List<String> args = Arrays.asList("2", "3", "4");
+        List collectedArgs = collector.collectArguments(args, null);
+        assertEquals(2, collectedArgs.size());
+        assertTrue(collectedArgs.get(1).getClass().isArray());
+        assertEquals(String.class, ((Object[])collectedArgs.get(1))[0].getClass());
+        assertEquals(String.class, ((Object[])collectedArgs.get(1))[1].getClass());
+    }
 }