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

Author: Hi-Fi

.travis.yml

@@ -8,6 +8,7 @@ env:
   - PROFILE=build
   - PROFILE=build,googlechromeheadless
   - PROFILE=build,firefoxheadless
+  - PROFILE=build,htmlunitwithjs
 
 stages:
   - test

README.md

@@ -45,18 +45,18 @@ your pom.xml:
     <dependency>
         <groupId>com.github.hi-fi</groupId>
         <artifactId>robotframework-seleniumlibrary</artifactId>
-        <version>3.141.59.265</version>
+        <version>3.141.59.2653</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.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>`.  
+[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.2653/robotframework-seleniumlibrary-3.141.59.2653-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.2653-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.265/robotframework-seleniumlibrary-3.141.59.265.html).
+  [Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.2653/robotframework-seleniumlibrary-3.141.59.2653.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.265/robotframework-seleniumlibrary-3.141.59.265.xml)
+  [Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.2653/robotframework-seleniumlibrary-3.141.59.2653.xml)
   and place it in your PYTHONPATH.
 
 Usage, Selenium 4 (WIP)

pom.xml

@@ -141,6 +141,11 @@
 			<artifactId>jbrowserdriver</artifactId>
 			<version>1.1.0-RC1</version>
 		</dependency>
+		<dependency>
+		    <groupId>org.seleniumhq.selenium</groupId>
+		    <artifactId>htmlunit-driver</artifactId>
+		    <version>2.35.1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
@@ -373,6 +378,13 @@
 				</plugins>
 			</build>
 		</profile>
+        <profile>
+            <id>htmlunitwithjs</id>
+            <properties>
+                <browser>htmlunitwithjs</browser>
+                <downloadWebDriver>False</downloadWebDriver>
+            </properties>
+        </profile>
 		<profile>
 			<id>firefox</id>
 			<properties>

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

@@ -39,6 +39,7 @@
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.FirefoxProfile;
+import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.ie.InternetExplorerDriver;
 import org.openqa.selenium.ie.InternetExplorerOptions;
 import org.openqa.selenium.remote.Augmenter;
@@ -165,7 +166,9 @@ public void closeBrowser() {
             "| Safari    | safari    |\r\n" + 
             "| Android   | android   |\r\n" + 
             "| Iphone    | iphone    |\r\n" + 
-            "| JBrowser  | jbrowser  |\r\n" + 
+            "| JBrowser  | jbrowser  |\r\n" +
+            "| HTMLUnit  | htmlunit  |\r\n" + 
+            "| HTMLUnit with Javascript | htmlunitwithjs    |\r\n" + 
             "\r\n" + 
             "To be able to actually use one of these browsers, you need to have a matching Selenium browser driver available. See the [https://github.com/Hi-Fi/robotframework-seleniumlibrary-java#browser-drivers|project documentation] for more details.\r\n" +
             "\r\n" + 
@@ -672,6 +675,12 @@ protected WebDriver createLocalWebDriver(String browserName, Capabilities desire
                 } catch (Exception e) {
                     throw new SeleniumLibraryFatalException("Creating " + browserName + " instance failed.", e);
                 }
+            case "htmlunit":
+                return new HtmlUnitDriver(desiredCapabilities);
+            case "htmlunitwithjs":
+                HtmlUnitDriver driver = new HtmlUnitDriver(desiredCapabilities);
+                driver.setJavascriptEnabled(true);
+                return driver;
             default:
                 throw new SeleniumLibraryFatalException(browserName + " is not a supported browser.");
         }
@@ -761,6 +770,11 @@ protected Capabilities createCapabilities(String browserName, String desiredCapa
         case "jbrowser":
             desiredCapabilities = new DesiredCapabilities("jbrowser", "1", Platform.ANY);
             break;
+        case "htmlunit":
+        case "htmlunitwithjs":
+            desiredCapabilities = DesiredCapabilities.htmlUnit();
+            ((DesiredCapabilities) desiredCapabilities).setBrowserName("htmlunit");
+            break;
         default:
             throw new SeleniumLibraryFatalException(browserName + " is not a supported browser.");
         }

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

@@ -13,10 +13,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
-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 org.robotframework.javalib.annotation.*;
 
 import com.github.markusbernhardt.seleniumlibrary.RunOnFailureKeywordsAdapter;
 import com.github.markusbernhardt.seleniumlibrary.SeleniumLibraryNonFatalException;
@@ -423,17 +420,9 @@ public void elementTextShouldNotBe(String locator, String text, String...params)
         }
     }
 
-    @RobotKeyword("Returns the value of an element attribute.\r\n" +
-            "\r\n" +
-            "The ``attribute_locator`` consists of element locator followed by an @ sign and attribute name. Example: element_id@class\r\n" +
-            "\r\n" +
-            "Key attributes for arbitrary elements are id and name. See `Introduction` for details about locators.\r\n" +
-            "\r\n" +
-            "Passing attribute name as part of the locator was removed in SeleniumLibrary 3.2. The explicit attribute argument should be used instead.")
-    @ArgumentNames({ "attributeLocator" })
-    @Deprecated
-    public String getElementAttribute(String attributeLocator) {
-        String[] parts = parseAttributeLocator(attributeLocator);
+    @RobotKeywordOverload
+    public String getElementAttribute(String locator) {
+        String[] parts = parseAttributeLocator(locator);
         return getElementAttribute(parts[0], parts[1]);
     }
 
@@ -444,14 +433,15 @@ public String getElementAttribute(String attributeLocator) {
             "Example: ${id}=    Get Element Attribute   css:h1  id\r\n" +
             "\r\n" +
             "Passing attribute name as part of the locator was removed in SeleniumLibrary 3.2. The explicit attribute argument should be used instead.")
-    @ArgumentNames({ "locator", "attribute" })
-    public String getElementAttribute(String locator, String attribute) {
+    @ArgumentNames({ "locator", "attribute=None" })
+    public String getElementAttribute(String locator, String... attribute) {
+        String attributeName = robot.getParamsValue(attribute, 0, "None");
         List<WebElement> elements = elementFind(locator, true, false);
 
         if (elements.size() == 0) {
             throw new SeleniumLibraryNonFatalException(String.format("Element '%s' not found.", locator));
         }
-        return elements.get(0).getAttribute(attribute);
+        return elements.get(0).getAttribute(attributeName);
     }
 
     @RobotKeyword("Clears the text from element identified by ``locator``.\r\n" +

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

@@ -77,6 +77,7 @@ public void runOnFailure() {
 		if(runOnFailurePythonInterpreter.get().eval("EXECUTION_CONTEXTS.current").toString().equals("None")) {
 			return;
 		}
+		runningOnFailureRoutine = true;
 
 		try {
 			runOnFailurePythonInterpreter.get().exec(

src/test/java/com/github/markusbernhardt/seleniumlibrary/keywords/BrowserManagementTest.java

@@ -62,6 +62,12 @@ public void testCreateDesiredCapabilitiesWithOnlyBrowserOptions() {
         assertTrue(profile.getStringPreference("network.proxy.http", "wrong") != "wrong");
     }
 
+    @Test
+    public void testCreateDesiredCapabilitiesForHtmlUnit() {
+        Capabilities dc = bm.createCapabilities("htmlunitwithjs", null, "");
+        assertTrue(dc.getBrowserName().equals("htmlunit"));
+    }
+    
     @Test
     public void parseChromeBrowserOptions() {
         ChromeOptions chromeOptions = new ChromeOptions();

src/test/robotframework/testsuites/UnitTests/AW3Schools.robot

@@ -1,13 +1,13 @@
 *** Settings ***
 Suite Teardown    Close All Browsers
 Resource          ../../settings/Settings.robot
+Default Tags      htmlunitwith    htmlunitwithjs
 
 *** Variables ***
 ${URL Application}    http://www.w3schools.com
 
 *** Test Cases *** 
 Select
-    [Tags]    jbrowser
     Open Browser    https://developer.mozilla.org/en/docs/Web/HTML/Element/select#Examples    ${browser}    mainbrowser
     Wait Until Page Contains Element    xpath://select
     Select From List    xpath://select    Third Value

src/test/robotframework/testsuites/UnitTests/ExtJS.robot

@@ -2,7 +2,6 @@
 Suite Setup       Open Page
 Suite Teardown    Close Browser
 Resource          ../../settings/Settings.robot
-Default Tags      jbrowser
 
 *** Variables ***
 ${URL Application}     http://examples.sencha.com/extjs/6.5.0/examples/classic/ticket-app/index.html

src/test/robotframework/testsuites/UnitTests/GetInnerElementId.robot

@@ -1,6 +1,5 @@
 *** Settings ***
 Resource          ../../settings/Settings.robot
-Default Tags      jbrowser
 
 *** Test Cases ***
 Get Inner Element Id test

src/test/robotframework/testsuites/UnitTests/WhatAreCookies.robot

@@ -5,5 +5,5 @@ Resource          ../../settings/Settings.robot
 Cookies
     Open Browser    http://www.whatarecookies.com/cookietest.asp    ${browser}    mainbrowser
     ${all_cookies}=    Get Cookies
-    ${test}=    Get Cookie Value    __atuvc
+    ${test}=    Get Cookie Value    _ga
     Close Browser