Added local HTML for test

Fixes #52

Added input field types from Python version

Some refactoring

Author: Hi-Fi

pom.xml

@@ -227,6 +227,7 @@
 								<variables>
 									<variable>browser:${browser}</variable>
 									<variable>downloadWebDriver:${downloadWebDriver}</variable>
+									<variable>testHTMLDirectory:${project.basedir}/src/test/resources</variable>
 								</variables>
 								<report>target/robotframework-reports/${browser}_report.html</report>
 								<log>target/robotframework-reports/${browser}_log.html</log>

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

@@ -319,7 +319,7 @@ public String getRemoteCapabilities() {
         // Null returned from jbrowserdriver
         if (getCurrentWebDriver() instanceof RemoteWebDriver
                 && ((RemoteWebDriver) getCurrentWebDriver()).getCapabilities() != null) {
-            System.out.println(getCurrentWebDriver());
+            logging.info(getCurrentWebDriver());
             return ((RemoteWebDriver) getCurrentWebDriver()).getCapabilities().toString();
         } else {
             return "No remote session id or capabilities available";

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

@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -520,7 +519,7 @@ public String getValue(String locator) {
     }
 
     protected String getValue(String locator, String tag) {
-        List<WebElement> elements = elementFind(locator, true, false, tag);
+        List<WebElement> elements = elementFind(locator, true, true, tag);
 
         if (elements.size() == 0) {
             return null;

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

@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.WebElement;
 import org.robotframework.javalib.annotation.ArgumentNames;
 import org.robotframework.javalib.annotation.Autowired;
@@ -252,8 +253,8 @@ public void pageShouldNotContainTextfield(String locator, String...params) {
 	public void textfieldValueShouldBe(String locator, String text, String...params) {
         String message = robot.getParamsValue(params, 0, "");
 		String actual = element.getValue(locator, "text field");
-		if (!actual.contains(text)) {
-			if (message == null) {
+		if (actual == null || !actual.contains(text)) {
+			if (StringUtils.isEmpty(message)) {
 				message = String.format("Value of text field '%s' should have been '%s' but was '%s'", locator, text,
 						actual);
 			}

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

@@ -198,7 +198,7 @@ protected void error(String msg) {
     protected void log(String msg, String logLevel) {
         String[] methodParameters = VALID_LOG_LEVELS.get(logLevel.toLowerCase());
         if (methodParameters != null) {
-            System.out.printf("*%s* %s ", logLevel.toUpperCase(), msg);
+            System.out.println(String.format("*%s* %s", logLevel.toUpperCase(), msg));
         } else {
             throw new SeleniumLibraryNonFatalException(String.format("Given log level %s is invalid.", logLevel));
         }

src/main/java/com/github/markusbernhardt/seleniumlibrary/locators/ElementFinder.java

@@ -158,7 +158,7 @@ protected static boolean elementMatches(WebElement element, FindByCoordinates fi
 
 		if (findByCoordinates.constraints != null) {
 			for (String name : findByCoordinates.constraints.keySet()) {
-				if (!element.getAttribute(name).equals(findByCoordinates.constraints.get(name))) {
+				if (findByCoordinates.constraints.get(name) != null && !Arrays.asList(findByCoordinates.constraints.get(name).split(",")).contains(element.getAttribute(name))) {
 					return false;
 				}
 			}
@@ -184,17 +184,18 @@ protected static List<WebElement> findByKeyAttrs(WebDriver webDriver, FindByCoor
 		List<String> xpathConstraints = new ArrayList<>();
 		if (findByCoordinates.constraints != null) {
 			for (Entry<String, String> entry : findByCoordinates.constraints.entrySet()) {
-				xpathConstraints.add(String.format("@%s='%s'", entry.getKey(), entry.getValue()));
+				for (String value: entry.getValue().split(",")) {
+					xpathConstraints.add(String.format("@%s='%s'", entry.getKey(), value));
+				}
 			}
 		}
 		List<String> xpathSearchers = new ArrayList<>();
 		for (String attr : keyAttrs.getKeyAttrs()) {
 			xpathSearchers.add(String.format("%s=%s", attr, xpathCriteria));
 		}
 		xpathSearchers.addAll(getAttrsWithUrl(webDriver, keyAttrs, findByCoordinates.criteria));
-		String xpath = String.format("//%s[%s(%s)]", xpathTag, Python.join(" and ", xpathConstraints)
-				+ (xpathConstraints.size() > 0 ? " and " : ""), Python.join(" or ", xpathSearchers));
-
+		String xpath = String.format("//%s[(%s)%s(%s)]", xpathTag, Python.join(" or ", xpathConstraints)
+				,(xpathConstraints.size() > 0 ? " and " : ""), Python.join(" or ", xpathSearchers));
 		return webDriver.findElements(By.xpath(xpath));
 	}
 
@@ -319,7 +320,7 @@ protected static void parseTag(FindByCoordinates findByCoordinates, String tag)
 				break;
 			case "text field":
 				tag = "input";
-				constraints.put("type", "text");
+				constraints.put("type", "date,datetime-local,email,month,number,password,search,tel,text,time,url,week,file");
 				break;
 			case "file upload":
 				tag = "input";

src/test/resources/formtest.html

@@ -0,0 +1,15 @@
+<html><head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <title></title>
+
+</head>
+<body>
+    First name:<br>
+  <input type="text" name="firstname" value="Mickey">
+  <br>
+  Last name:<br>
+  <input type="text" name="lastname" value="Mouse">
+  <br><br>
+  Add your homepage:
+  <input type="url" name="homepage" value="http://example.com">
+</body></html>

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

@@ -0,0 +1,12 @@
+*** Settings ***
+Suite Teardown    Close All Browsers
+Resource          ../../settings/Settings.robot
+
+*** Variables ***
+${URL Application}    http://www.w3schools.com
+
+*** Test Cases *** 
+Check Form
+    Open Browser    file:///${testHTMLDirectory}/formtest.html    ${browser}
+    Textfield Value Should Be    name:firstname    Mickey
+    Textfield Value Should Be    name:homepage    http://example.com