Update dependencies and code to be compatible to RF 3.2.1 (#133)

Author: mihaiparvu

pom.xml

@@ -8,7 +8,7 @@
   </parent>
   <groupId>org.robotframework</groupId>
   <artifactId>swinglibrary</artifactId>
-  <version>1.9.9</version>
+  <version>2.0.0</version>
   <packaging>jar</packaging>
   <name>swinglibrary</name>
   <description>A Robot Framework test library for Swing UI testing</description>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.robotframework</groupId>
       <artifactId>javalib-core</artifactId>
-      <version>1.2</version>
+      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.jretrofit</groupId>
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2</version>
+      <version>[3.2.2,)</version>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.paranamer</groupId>
@@ -120,8 +120,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -138,7 +138,7 @@
       <plugin>
         <groupId>org.robotframework</groupId>
         <artifactId>robotframework-maven-plugin</artifactId>
-        <version>1.5.1</version>
+        <version>1.7.1</version>
         <executions>
           <execution>
             <goals>
@@ -181,12 +181,13 @@
               </extraPathDirectories>
               <libraryOrResourceFile>SwingLibrary</libraryOrResourceFile>
           </libdoc>
+          <testdoc/>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>jarjar-maven-plugin</artifactId>
-        <version>1.7</version>
+        <version>1.9</version>
         <executions>
           <execution>
             <phase>package</phase>

src/main/java/com/some/own/keyword/KeywordsInOtherPackage.java

@@ -14,7 +14,8 @@ public String keywordInOtherPackage(String arg) {
     }
 
     @RobotKeyword
-    public String keywordwithoutArgumentNames(String arg) {
-        return arg;
+    @ArgumentNames({"*args"})
+    public String keywordwithoutArgumentNames(String... args) {
+        return args[0];
     }
 }

src/main/java/org/robotframework/swing/SwingLibrary.java

@@ -19,15 +19,17 @@
 import org.netbeans.jemmy.TestOut;
 import org.robotframework.javalib.library.AnnotationLibrary;
 import org.robotframework.javalib.library.KeywordDocumentationRepository;
-import org.robotframework.javalib.library.RobotJavaLibrary;
+import org.robotframework.javalib.library.RobotFrameworkDynamicAPI ;
 import org.robotframework.swing.keyword.timeout.TimeoutKeywords;
 import org.robotframework.swing.util.StandardOutOutput;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.Collection;
 import java.util.Collections;
 
-public class SwingLibrary implements KeywordDocumentationRepository, RobotJavaLibrary {
+public class SwingLibrary implements KeywordDocumentationRepository, RobotFrameworkDynamicAPI  {
     public static final String ROBOT_LIBRARY_SCOPE = "GLOBAL";
     public static SwingLibrary instance;
     private final AnnotationLibrary annotationLibrary = new AnnotationLibrary(
@@ -116,12 +118,17 @@ private void addKeywordPatterns(Collection<String> keywordPatterns) {
     }
 
     @Override
-    public Object runKeyword(String keywordName, Object[] args) {
-        return annotationLibrary.runKeyword(keywordName, toStrings(args));
+    public Object runKeyword(String keywordName, List args) {
+        return annotationLibrary.runKeyword(keywordName, args);
     }
 
     @Override
-    public String[] getKeywordArguments(String keywordName) {
+    public Object runKeyword(String keywordName, List args, Map kwargs) {
+        return annotationLibrary.runKeyword(keywordName, args, kwargs);
+    }
+
+    @Override
+    public List<String> getKeywordArguments(String keywordName) {
         return annotationLibrary.getKeywordArguments(keywordName);
     }
 
@@ -133,7 +140,7 @@ public String getKeywordDocumentation(String keywordName) {
     }
 
     @Override
-    public String[] getKeywordNames() {
+    public List<String> getKeywordNames() {
         return annotationLibrary.getKeywordNames();
     }
 
@@ -145,16 +152,4 @@ private void disableOutput() {
         TestOut out = new StandardOutOutput();
         JemmyProperties.setCurrentOutput(out);
     }
-
-    private Object[] toStrings(Object[] args) {
-        Object[] newArgs = new Object[args.length];
-        for (int i = 0; i < newArgs.length; i++) {
-            if (args[i].getClass().isArray()) {
-                newArgs[i] = args[i];
-            } else {
-                newArgs[i] = args[i].toString();
-            }
-        }
-        return newArgs;
-    }
 }

src/main/java/org/robotframework/swing/keyword/component/ComponentKeywords.java

@@ -21,9 +21,8 @@
 import org.netbeans.jemmy.operators.JPopupMenuOperator;
 import org.robotframework.javalib.annotation.ArgumentNames;
 import org.robotframework.javalib.annotation.RobotKeyword;
-import org.robotframework.javalib.annotation.RobotKeywordOverload;
 import org.robotframework.javalib.annotation.RobotKeywords;
-import org.robotframework.javalib.reflection.ArgumentConverter;
+import org.robotframework.javalib.reflection.ArgumentCollector;
 import org.robotframework.swing.comparator.EqualsStringComparator;
 import org.robotframework.swing.component.ComponentOperator;
 import org.robotframework.swing.component.ComponentOperatorFactory;
@@ -36,6 +35,7 @@
 import java.awt.*;
 import java.awt.event.InputEvent;
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
 import java.util.*;
 import java.util.List;
 
@@ -72,8 +72,8 @@ public void componentShouldExist(String identifier) {
             + "| `Click On Component`  | myComponent | # Double clicks with mouse button 2 on the component ... |\n"
             + "| ... | 2 | RIGHT BUTTON | ALT | # ... while holding down the ALT key |\n")
     @ArgumentNames({ "identifier", "clickCountString=1", "buttonString=BUTTON1_MASK", "*keyModifierStrings" })
-    public void clickOnComponent(String identifier, String[] optionalArgs) {
-        OptionalArgsForTableCellAndComponentClicking optArgs = new OptionalArgsForTableCellAndComponentClicking(optionalArgs);
+    public void clickOnComponent(String identifier, String clickCountString, String buttonString, String... args) {
+        OptionalArgsForTableCellAndComponentClicking optArgs = new OptionalArgsForTableCellAndComponentClicking(clickCountString, buttonString, args);
         operator(identifier).clickOnComponent(
                 optArgs.clickCount(),
                 optArgs.button(),
@@ -204,18 +204,31 @@ private Method getMethodByNameAndArgumentCount(Class klass, String name, int arg
         throw new RuntimeException(String.format("Method \"%s\" with %d argument(s) doesn't exist.", name, argCount));
     }
 
+    public static List<String> getParameterNames(Method method) {
+        Parameter[] parameters = method.getParameters();
+        List<String> parameterNames = new ArrayList<>();
+
+        for (Parameter parameter : parameters) {
+            String parameterName = parameter.getName();
+            parameterNames.add(parameterName);
+        }
+
+        return parameterNames;
+    }
+
     @RobotKeyword("Calls a method from specified component.\n\n"
                   + "Arguments are automatically converted if possible to type expected by the method.\n\n"
                   + "Example:\n"
                   + "| `Call Component Method` | buttonId | setToolTipText | new tooltip text |")
     @ArgumentNames({"identifier", "method", "*args"})
-    public Object callComponentMethod(String identifier, String method, String[] args) {
+    public Object callComponentMethod(String identifier, String method, String... args) {
         Object component = operator(identifier).getSource();
         Class klass = component.getClass();
         Method m = getMethodByNameAndArgumentCount(klass, method, args.length);
 
         try {
-            return m.invoke(component, new ArgumentConverter(m.getParameterTypes()).convertArguments(args));
+           return m.invoke(component, new ArgumentCollector(m.getParameterTypes(), getParameterNames(m)).collectArguments(Arrays.asList(args), null).toArray());
+
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/main/java/org/robotframework/swing/keyword/concurrent/ThreadKeywords.java

@@ -47,32 +47,32 @@ public void runKeywordInSeparateThread(final String keywordName, final Object...
         assertArgumentCountIsCorrect(keywordName, arguments);
         new Thread() {
             public void run() {
-                SwingLibrary.instance.runKeyword(keywordName, arguments);
+                SwingLibrary.instance.runKeyword(keywordName, Arrays.asList(arguments));
             }
         }.start();
     }
 
     public String stringify(String keywordName, Object... arguments) {
         assertKeywordExists(keywordName);
         assertArgumentCountIsCorrect(keywordName, arguments);
-        return SwingLibrary.instance.runKeyword(keywordName, arguments).toString();
+        return SwingLibrary.instance.runKeyword(keywordName, Arrays.asList(arguments)).toString();
     }
 
     private void assertArgumentCountIsCorrect(String keywordName, Object[] arguments) {
-        String[] keywordArguments = SwingLibrary.instance.getKeywordArguments(normalizer.normalize(keywordName));
+        List<String> keywordArguments = SwingLibrary.instance.getKeywordArguments(normalizer.normalize(keywordName));
         if (keywordArguments == null)
             return;
         if (hasVarArgs(keywordArguments)) {
-            String errorMessage = "Expected " + (keywordArguments.length-1) + " or more but got " + arguments.length + " arguments.     ";
-            Assert.assertTrue(errorMessage, keywordArguments.length-1 <= arguments.length);
+            String errorMessage = "Expected " + (keywordArguments.size()-1) + " or more but got " + arguments.length + " arguments.     ";
+            Assert.assertTrue(errorMessage, keywordArguments.size()-1 <= arguments.length);
         } else {
-            String errorMessage = "Expected " + keywordArguments.length + " but got " + arguments.length + " arguments.     ";
-            Assert.assertEquals(errorMessage, keywordArguments.length, arguments.length);
+            String errorMessage = "Expected " + keywordArguments.size() + " but got " + arguments.length + " arguments.     ";
+            Assert.assertEquals(errorMessage, keywordArguments.size(), arguments.length);
         }
     }
 
-    private boolean hasVarArgs(String[] keywordArguments) {
-        return keywordArguments.length > 0 && keywordArguments[keywordArguments.length-1].startsWith("*");
+    private boolean hasVarArgs(List<String> keywordArguments) {
+        return keywordArguments.size() > 0 && keywordArguments.get(keywordArguments.size()-1).startsWith("*");
     }
 
     private void assertKeywordExists(final String keywordName) {
@@ -83,9 +83,8 @@ private void assertKeywordExists(final String keywordName) {
     }
 
     @SuppressWarnings("unchecked")
-    private Collection<String> normalizeKeywordNames(String[] keywordNames) {
-        List<String> keywordsList = Arrays.asList(keywordNames);
-        return CollectionUtils.collect(keywordsList, new Transformer() {
+    private Collection<String> normalizeKeywordNames(List<String> keywordNames) {
+        return CollectionUtils.collect(keywordNames, new Transformer() {
             public Object transform(Object input) {
                 return normalizer.normalize(input.toString());
             }

src/main/java/org/robotframework/swing/keyword/table/TableKeywords.java

@@ -139,11 +139,6 @@ private CellValueExtractor.TextSource textExtractionSourceFromText(String text)
             return CellValueExtractor.TextSource.AUTO;
     }
 
-    @RobotKeywordOverload
-    public String getTableCellValue(String identifier, String row, String columnIdentifier) {
-        return getTableCellValue(identifier, row, columnIdentifier, "auto");
-    }
-
     @RobotKeyword("Returns selected cell's value from a table.\n\n"
             + "Optional parameter ``source`` allows to override text extraction strategy. "
             + "Available values are ``auto`` (default, will try to get text from cell component "
@@ -157,11 +152,6 @@ public Object getSelectedTableCellValue(String identifier, String source) {
         return createTableOperator(identifier).getSelectedCellValue(textSource).toString();
     }
 
-    @RobotKeywordOverload
-    public Object getSelectedTableCellValue(String identifier) {
-        return getSelectedTableCellValue(identifier, "auto");
-    }
-
     @RobotKeyword("Sets cell value in a table.\n\n"
             + "Example:\n"
             + "| `Set Table Cell Value` | 1 | 2 | New value |\n")
@@ -334,8 +324,8 @@ private JMenuItemOperator getPopupMenuItem(String identifier, String row, String
             + "| `Click On Table Cell`  | myTable | 1 | Header | # Single click on the cell in the second row and column with header 'Header'... |\n"
             + "| ... | 1 | BUTTON1_MASK | CTRL_MASK | SHIFT_MASK | # ... while holding down the CTRL and SHIFT keys |\n")
     @ArgumentNames({"identifier", "row", "column", "clickCountString=1", "buttonString=BUTTON1_MASK", "*keyModifierStrings"})
-    public void clickOnTableCell(final String identifier, final String row, final String column, final String[] optionalArgs) {
-        OptionalArgsForTableCellAndComponentClicking optArgs = new OptionalArgsForTableCellAndComponentClicking(optionalArgs);
+    public void clickOnTableCell(final String identifier, final String row, final String column, final String clickCountString, final String buttonString, final String... args) {
+        OptionalArgsForTableCellAndComponentClicking optArgs = new OptionalArgsForTableCellAndComponentClicking(clickCountString, buttonString, args);
         createTableOperator(identifier).clickOnCell(row,
                 column,
                 optArgs.clickCount(),

src/main/java/org/robotframework/swing/keyword/utils/OptionalArgsForTableCellAndComponentClicking.java

@@ -1,7 +1,6 @@
 package org.robotframework.swing.keyword.utils;
 
-import org.robotframework.javalib.util.ArrayUtil;
-
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,38 +17,22 @@ public class OptionalArgsForTableCellAndComponentClicking {
         put("META", "META_MASK");
     }};
 
-    private String[] optionalArgs;
+    private final String clickCountString;
+    private final String buttonClick;
+    private final String[] optionalArgs;
 
-    public OptionalArgsForTableCellAndComponentClicking(String[] optionalArgs) {
+    public OptionalArgsForTableCellAndComponentClicking(String clickCountString, String buttonClick, String[] optionalArgs) {
+        this.clickCountString = clickCountString;
+        this.buttonClick = buttonClick;
         this.optionalArgs = optionalArgs;
     }
 
     public String clickCount() {
-        if (clickCountSpecified())
-            return getClickCount();
-        return "1";
-    }
-
-    private boolean clickCountSpecified() {
-        return optionalArgs.length > 0;
-    }
-
-    private String getClickCount() {
-        return optionalArgs[0];
+        return this.clickCountString;
     }
 
     public String button() {
-        if (buttonSpecified())
-            return getButton();
-        return "BUTTON1_MASK";
-    }
-
-    private boolean buttonSpecified() {
-        return optionalArgs.length > 1;
-    }
-
-    private String getButton() {
-        return keyMask(optionalArgs[1]);
+        return keyMask(this.buttonClick);
     }
 
     private String keyMask(String arg) {
@@ -67,11 +50,11 @@ public String[] keyModifiers() {
     }
 
     private boolean keymodifiersSpecifiedIn() {
-        return optionalArgs.length > 2;
+        return optionalArgs.length > 0;
     }
 
     private String[] getKeyModifiers() {
-        return replaceAliasesIn(ArrayUtil.copyOfRange(optionalArgs, 2, optionalArgs.length));
+        return replaceAliasesIn(Arrays.copyOfRange(optionalArgs, 0, optionalArgs.length));
     }
 
     private String[] replaceAliasesIn(String[] keyModifiers) {

src/main/java/org/robotframework/swing/testapp/TestTable.java

@@ -21,8 +21,6 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
-import org.robotframework.javalib.util.ArrayUtil;
-
 @SuppressWarnings("serial")
 public class TestTable extends JScrollPane {
 
@@ -155,7 +153,7 @@ private static class MyTabeModel extends DefaultTableModel {
         public MyTabeModel(Object[][] data) {
             this.data = data;
             for (Object[] datarow : data)
-                addColumn(datarow[0], ArrayUtil.copyOfRange(datarow, 1, datarow.length));
+                addColumn(datarow[0], Arrays.copyOfRange(datarow, 1, datarow.length));
         }
 
         public Class<?> getColumnClass(int col) {

src/main/java/org/robotframework/swing/testapp/TestTreeResults.java

@@ -9,6 +9,7 @@ public class TestTreeResults {
     public static List<String> nodes = new ArrayList<String>();
     public static int clickCount;
     public static void saveNodes(TreePath[] selectionPaths) {
+        nodes.clear();
         for (TreePath treePath : selectionPaths) {
             nodes.add(treePath.getLastPathComponent().toString().toLowerCase());
         }