Merge branch 'develop' of github.com:Hi-Fi/robotframework-seleniumlibrary-java into removeExtraDependencies

Author: Hi-Fi

.travis.yml

@@ -1,12 +1,6 @@
 language: java
 dist: trusty
 
-matrix:
-  include:
-    - os: linux
-    - os: osx
-      osx_image: xcode9.3
-
 jdk:
   - oraclejdk8
 

README.md

@@ -45,18 +45,18 @@ your pom.xml:
     <dependency>
         <groupId>com.github.hi-fi</groupId>
         <artifactId>robotframework-seleniumlibrary</artifactId>
-        <version>3.141.59.26</version>
+        <version>3.141.59.265</version>
         <scope>test</scope>
     </dependency>
 
 If you cannot use the robotframework-maven-plugin you can use the
-[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26-jar-with-dependencies.jar),
-which contains all required libraries. Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-3.141.59.26-jar-with-dependencies.jar <test location>`.  
+[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265-jar-with-dependencies.jar),
+which contains all required libraries. Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-3.141.59.265-jar-with-dependencies.jar <test location>`.  
 
 * More information about this library can be found in the
-  [Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26.html).
+  [Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265.html).
 * For keyword completion in RIDE you can download this
-  [Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26.xml)
+  [Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265.xml)
   and place it in your PYTHONPATH.
 
 Usage, Selenium 4 (WIP)
@@ -116,7 +116,11 @@ to know when to update drivers you use.
 
 Drivers can also be fetched with [https://github.com/Ardesco/selenium-standalone-server-plugin|Selenium Driver Binary Downloader plugin].
 
+<<<<<<< HEAD
 With Selenium 4 [https://github.com/bonigarcia/webdrivermanager|WebdriverManager] is taken to use, so handling of drivers can also be done with standalone JAR from tests itself.
+=======
+With At 3.141.59.265 [https://github.com/bonigarcia/webdrivermanager|WebdriverManager] is taken to use, so handling of drivers can also be done with standalone JAR from tests itself.
+>>>>>>> 6b856261db4247ab771ecfafe4912c36a508aef1
 
 __ https://seleniumhq.github.io/selenium/docs/api/py/index.html#drivers
 __ https://en.wikipedia.org/wiki/PATH_(variable)

src/main/java/com/github/markusbernhardt/seleniumlibrary/CustomRobotDriverElement.java

@@ -1,6 +1,7 @@
 package com.github.markusbernhardt.seleniumlibrary;
 
 import com.github.markusbernhardt.seleniumlibrary.keywords.BrowserManagement;
+import com.github.markusbernhardt.seleniumlibrary.keywords.Logging;
 import com.github.markusbernhardt.seleniumlibrary.keywords.Robot;
 import org.openqa.selenium.WebDriver;
 
@@ -16,7 +17,8 @@ public class CustomRobotDriverElement {
 
     private static SeleniumLibrary s;
     private static BrowserManagement b;
-    private Robot robot = new Robot();
+    protected Robot robot = new Robot();
+    protected Logging logging = new Logging();
 
     public CustomRobotDriverElement() throws NoSuchFieldException, IllegalAccessException {
         try {
@@ -41,9 +43,4 @@ private static SeleniumLibrary getLibraryInstance() throws ScriptException {
     protected WebDriver getCurrentBrowser() {
         return b.getCurrentWebDriver();
     }
-
-    protected Robot getRobot() {
-        return robot;
-    }
-
 }

src/main/java/com/github/markusbernhardt/seleniumlibrary/SeleniumLibrary.java

@@ -63,7 +63,6 @@ public SeleniumLibrary(String timeout, String implicitWait, String keywordToRunO
         if (!screenshotPath.isEmpty()) {
             screenshot.setScreenshotDirectory(screenshotPath);
         }
-        
     }
 
     // ##############################
@@ -79,7 +78,6 @@ public SeleniumLibrary(String timeout, String implicitWait, String keywordToRunO
     @Autowired
     Screenshot screenshot;
 
-
     @Override
     public String getKeywordDocumentation(String keywordName) {
         if (keywordName.equals("__intro__")) {
@@ -185,6 +183,5 @@ public String getKeywordDocumentation(String keywordName) {
             }
         }
         return keywordName;
-
     }
 }

src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/Cookie.java

@@ -42,12 +42,12 @@ public void deleteCookie(String name) {
 
 	@RobotKeyword("Returns all cookies of the current page.")
 	public String getCookies() {
-		StringBuffer ret = new StringBuffer();
+		StringBuilder ret = new StringBuilder();
 
-		ArrayList<org.openqa.selenium.Cookie> cookies = new ArrayList<org.openqa.selenium.Cookie>(browserManagement
+		ArrayList<org.openqa.selenium.Cookie> cookies = new ArrayList<>(browserManagement
 				.getCurrentWebDriver().manage().getCookies());
 		for (int i = 0; i < cookies.size(); i++) {
-			ret.append(cookies.get(i).getName() + "=" + cookies.get(i).getValue());
+			ret.append(cookies.get(i).getName()).append('=').append(cookies.get(i).getValue());
 			if (i != cookies.size() - 1) {
 				ret.append("; ");
 			}

src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/DataUtils.java

@@ -0,0 +1,54 @@
+package com.github.markusbernhardt.seleniumlibrary.keywords;
+
+import com.github.markusbernhardt.seleniumlibrary.RunOnFailureKeywordsAdapter;
+import org.robotframework.javalib.annotation.ArgumentNames;
+import org.robotframework.javalib.annotation.Autowired;
+import org.robotframework.javalib.annotation.RobotKeyword;
+import org.robotframework.javalib.annotation.RobotKeywords;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+@RobotKeywords
+public class DataUtils extends RunOnFailureKeywordsAdapter {
+
+    private static final String ASCENDING = "ascending";
+    private static final String DESCENDING = "descending";
+
+    @Autowired
+    protected Robot robot;
+
+    /**
+     * Instantiated Logging keyword bean
+     */
+    @Autowired
+    protected Logging logging;
+
+    // ##############################
+    // Keywords
+    // ##############################
+
+    /**
+     * Sort list of strings.
+     *
+     * @param jsonStringOfList  json string of list strings
+     * @param params            sorting order
+     * @return sorting list of strings
+     */
+    @RobotKeyword("Returns sorting list of strings by ``order``.")
+    @ArgumentNames({"list", "order=ascending"})
+    public List<String> sortStrings(String jsonStringOfList, String... params) {
+        List<String> listOfStrings = robot.parseRobotList(jsonStringOfList);
+        String order = robot.getParamsValue(params, 0, ASCENDING);
+        List<String> sortedList = new ArrayList<>(listOfStrings);
+        if (order.equalsIgnoreCase(DESCENDING)) {
+            listOfStrings.sort(Collections.reverseOrder());
+        } else {
+            Collections.sort(listOfStrings);
+        }
+        logging.info(String.format("Sorted list '%s' by %s", sortedList, order.toUpperCase(Locale.ENGLISH)));
+        return sortedList;
+    }
+}