Map and List arg usage

Hi-Fi · Hi-Fi · commit 7bd3e7bd8967 · 2020-01-13T07:54:46.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -103,10 +103,24 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>2.22.2</version>
             </plugin>
+            <!-- Source plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.robotframework</groupId>
                 <artifactId>robotframework-maven-plugin</artifactId>
-                <version>1.5.1</version>
+                <version>1.5.2</version>
                 <executions>
                     <execution>
                         <goals>
@@ -191,20 +205,6 @@
             <id>deploy</id>
             <build>
                 <plugins>
-					<!-- Source plugin -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.4</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
 					<!-- Javadoc plugin -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/robotframework/javalib/reflection/ArgumentCollector.java b/src/main/java/org/robotframework/javalib/reflection/ArgumentCollector.java
@@ -99,15 +99,12 @@ private Object ensureCorrectVarargsType(List varargs) {
     }
 
     private boolean keywordHasVarargs() {
-        int varargIndex = this.getVarargsIndex();
-        return varargIndex > -1 && parameterTypes != null && parameterTypes.length > 0 &&
-                (parameterTypes[parameterTypes.length-1] == List.class || parameterTypes[parameterTypes.length-1].isArray() ||
-                        (parameterTypes.length > 1 && (parameterTypes[parameterTypes.length-2] == List.class || parameterTypes[parameterTypes.length-2].isArray())));
+        return this.getVarargsIndex() > -1;
     }
 
     private boolean keywordHasKwargs() {
-        return parameterTypes != null && parameterTypes.length > 0 &&
-                (parameterTypes[parameterTypes.length-1] == Map.class);
+        return parameterNames != null && parameterNames.size() > 0 &&
+                (parameterNames.get(parameterNames.size()-1).startsWith("**"));
     }
 
     private Object convertToType(Class<?> clazz, Object object) {
@@ -128,10 +125,14 @@ private Object convertToType(Class<?> clazz, Object object) {
                 return Double.valueOf(object.toString());
             } else if (clazz == String.class) {
                 return object.toString();
-            } else if (clazz.isAssignableFrom(object.getClass())) {
-                return object;
+            } else if (object.getClass().isArray() && clazz.isAssignableFrom(List.class)) {
+                //convert array to list. Needed at least with jrobotremotelibrary
+                return Arrays.asList((Object[])object);
+            } else if (List.class.isAssignableFrom(object.getClass()) && clazz.isArray()) {
+                //convert list to array. Needed at least with jrobotremotelibrary
+                return ((List)object).toArray();
             }
         }
-        return null;
+        return object;
     }
 }
diff --git a/src/test/java/org/robotframework/javalib/keyword/AnnotatedKeywords.java b/src/test/java/org/robotframework/javalib/keyword/AnnotatedKeywords.java
@@ -126,4 +126,16 @@ public int useInt(int port) {
     public Integer useInteger(Integer port) {
         return port;
     }
+
+    @RobotKeyword
+    @ArgumentNames("arg")
+    public List<?> listAsArgument(List<?> arg) {
+        return arg;
+    }
+
+    @RobotKeyword
+    @ArgumentNames({ "arg" })
+    public Map<Object, Object> mapAsArgument(Map<Object, Object> arg) {
+        return arg;
+    }
 }
diff --git a/src/test/java/org/robotframework/javalib/library/AnnotationLibraryIntegrationTest.java b/src/test/java/org/robotframework/javalib/library/AnnotationLibraryIntegrationTest.java
@@ -23,7 +23,7 @@ public void findsAnnotatedKeywordsFromClassPath() throws Exception {
         List expectedKeywordNames = Arrays.asList("failingKeyword", "someKeyword", "overloaded",
                 keywordThatReturnsItsArguments, "keywordWithVariableArgumentCount", "variousArgs", "defaultValues",
                 "keywordWithObjectArgument", "getSomeObject", "keywordWithNumericArguments", byteArrayTest, "defaultAndVarargs", "onlyVarargs",
-                "useInt", "useInteger");
+                "useInt", "useInteger", "listAsArgument", "mapAsArgument");
         keywordNames.sort(Comparator.naturalOrder());
         expectedKeywordNames.sort(Comparator.naturalOrder());
         assertIterableEquals(keywordNames, expectedKeywordNames);
@@ -115,4 +115,18 @@ public void useInteger() {
         Object response = annotationLibrary.runKeyword("useInteger", Arrays.asList());
         assertEquals(0, response);
     }
+
+    @Test
+    public void listAsArgument() {
+        Object testList = Arrays.asList("first", 2, 4.4);
+        Object response = annotationLibrary.runKeyword("listAsArgument", Arrays.asList(testList));
+        assertEquals(testList, response);
+    }
+
+    @Test
+    public void mapAsArgument() {
+        Map testMap = Collections.singletonMap("first_key", "first_value");
+        Object response = annotationLibrary.runKeyword("mapAsArgument", Arrays.asList(testMap));
+        assertEquals(testMap, response);
+    }
 }
diff --git a/src/test/java/org/robotframework/javalib/library/AnnotationLibraryMultipleKeywordsWithSameNameIntegrationTest.java b/src/test/java/org/robotframework/javalib/library/AnnotationLibraryMultipleKeywordsWithSameNameIntegrationTest.java
@@ -30,7 +30,7 @@ public void testFindsAnnotatedKeywordsFromClassPath() {
         		keywordThatReturnsItsArguments, "keywordWithVariableArgumentCount", "variousArgs", "defaultValues",
                 "keywordWithObjectArgument", "getSomeObject", "keywordWithNumericArguments",
         		"myFailingKeyword", "myKeywordThatReturnsItsArguments", "byteArrayTest", "defaultAndVarargs", "onlyVarargs",
-                "useInt", "useInteger");
+                "useInt", "useInteger", "listAsArgument", "mapAsArgument");
         keywordNames.sort(Comparator.naturalOrder());
         expectedKeywordNames.sort(Comparator.naturalOrder());
         assertIterableEquals(keywordNames, expectedKeywordNames);
diff --git a/src/test/robotframework/acceptance/annotationlibrarywithmultiplepatterns.robot b/src/test/robotframework/acceptance/annotationlibrarywithmultiplepatterns.robot
@@ -16,3 +16,10 @@ Finds Annotated Keywords
 Extracts Inner Exception From Failing Keywords
 	runKeywordAndExpectError	Assertion failed	failingKeyword
 	runKeywordAndExpectError	Assertion failed	myFailingKeyword
+
+Test lists
+    ${returned list}    List As Argument    ${LIST}
+    Should Be Equal    ${LIST}    ${returned list}
+    ${returned list}    List As Argument    ${EMPTY LIST}
+    Should Be Equal    ${EMPTY LIST}    ${returned list}
+
diff --git a/src/test/robotframework/acceptance/variables.py b/src/test/robotframework/acceptance/variables.py
@@ -1,5 +1,6 @@
 from java.util import ArrayList
-
+LIST = ['One', -2, False]
+EMPTY_LIST = []
 
 keyword_patterns = ArrayList()
 keyword_patterns.add("org/**/keyword/**/**.class")

Original file line number	Diff line number	Diff line change
`@@ -99,15 +99,12 @@ private Object ensureCorrectVarargsType(List varargs) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private boolean keywordHasVarargs() {`
`102`		`- int varargIndex = this.getVarargsIndex();`
`103`		`- return varargIndex > -1 && parameterTypes != null && parameterTypes.length > 0 &&`
`104`		`- (parameterTypes[parameterTypes.length-1] == List.class \|\| parameterTypes[parameterTypes.length-1].isArray() \|\|`
`105`		`- (parameterTypes.length > 1 && (parameterTypes[parameterTypes.length-2] == List.class \|\| parameterTypes[parameterTypes.length-2].isArray())));`
	`102`	`+ return this.getVarargsIndex() > -1;`
`106`	`103`	`}`
`107`	`104`
`108`	`105`	`private boolean keywordHasKwargs() {`
`109`		`- return parameterTypes != null && parameterTypes.length > 0 &&`
`110`		`- (parameterTypes[parameterTypes.length-1] == Map.class);`
	`106`	`+ return parameterNames != null && parameterNames.size() > 0 &&`
	`107`	`+ (parameterNames.get(parameterNames.size()-1).startsWith("**"));`
`111`	`108`	`}`
`112`	`109`
`113`	`110`	`private Object convertToType(Class<?> clazz, Object object) {`
`@@ -128,10 +125,14 @@ private Object convertToType(Class<?> clazz, Object object) {`
`128`	`125`	`return Double.valueOf(object.toString());`
`129`	`126`	`} else if (clazz == String.class) {`
`130`	`127`	`return object.toString();`
`131`		`- } else if (clazz.isAssignableFrom(object.getClass())) {`
`132`		`- return object;`
	`128`	`+ } else if (object.getClass().isArray() && clazz.isAssignableFrom(List.class)) {`
	`129`	`+ //convert array to list. Needed at least with jrobotremotelibrary`
	`130`	`+ return Arrays.asList((Object[])object);`
	`131`	`+ } else if (List.class.isAssignableFrom(object.getClass()) && clazz.isArray()) {`
	`132`	`+ //convert list to array. Needed at least with jrobotremotelibrary`
	`133`	`+ return ((List)object).toArray();`
`133`	`134`	`}`
`134`	`135`	`}`
`135`		`- return null;`
	`136`	`+ return object;`
`136`	`137`	`}`
`137`	`138`	`}`