Merge pull request #58 from WojtekKowaluk/master

Thanks for your work!!!

Author: MarkusBernhardt

pom.xml

@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-server</artifactId>
-			<version>2.39.0</version>
+			<version>2.43.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.opera</groupId>
@@ -89,6 +89,21 @@
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-remote-driver</artifactId>
+			<version>2.43.1</version>
+		</dependency>
+		<dependency>
+			<groupId>io.selendroid</groupId>
+			<artifactId>selendroid-client</artifactId>
+			<version>0.11.0</version>
+		</dependency>
+		<dependency>
+			<groupId>io.appium</groupId>
+			<artifactId>java-client</artifactId>
+			<version>2.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>

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

@@ -26,13 +26,13 @@
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.android.AndroidDriver;
+import io.selendroid.SelendroidDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxProfile;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 import org.openqa.selenium.ie.InternetExplorerDriver;
-import org.openqa.selenium.iphone.IPhoneDriver;
+import io.appium.java_client.ios.IOSDriver;
 import org.openqa.selenium.phantomjs.PhantomJSDriver;
 import org.openqa.selenium.remote.Augmenter;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -1384,12 +1384,16 @@ protected WebDriver createLocalWebDriver(String browserName, DesiredCapabilities
 			return driver;
 		} else if ("iphone".equals(browserName) || "ipad".equals(browserName)) {
 			try {
-				return new IPhoneDriver(desiredCapabilities);
+				return new IOSDriver(new URL(""), desiredCapabilities);
 			} catch (Exception e) {
 				throw new Selenium2LibraryFatalException("Creating " + browserName + " instance failed.", e);
 			}
 		} else if ("android".equals(browserName)) {
-			return new AndroidDriver(desiredCapabilities);
+			try {
+				return new SelendroidDriver(desiredCapabilities);
+			} catch (Exception e) {
+				throw new Selenium2LibraryFatalException(e);
+			}
 		}
 
 		throw new Selenium2LibraryFatalException(browserName + " is not a supported browser.");

src/test/robotframework/objects/Google.Search.txt

@@ -5,11 +5,11 @@ Resource          ../adapters/Selenium2Library.txt
 
 *** Variables ***
 ${Google.Search.Locator.SearchField}    id=gbqfq
-${Google.Search.Locator.SearchResult.Rtomac}    xpath=//a[contains(.,'markusbernhardt')]
+${Google.Search.Locator.SearchResult.Rtomac}    xpath=//a[contains(.,'MarkusBernhardt')]
 
 *** Keywords ***
 Search String
     [Arguments]    ${Search.String}
     Input Text    ${Google.Search.Locator.SearchField}    ${Search.String}
     Press Key    ${Google.Search.Locator.SearchField}    \\13
-    Wait Until Element Is Visible    ${Google.Search.Locator.SearchResult.Rtomac}
+    Wait Until Element Is Visible    ${Google.Search.Locator.SearchResult.Rtomac}

src/test/robotframework/testsuites/UnitTests/Google.txt

@@ -21,7 +21,7 @@ Search With JavaScript Locator
     Selenium2Library.Add Location Strategy    elementById    return window.document.getElementById(arguments[0]);
     Input Text    elementById=gbqfq    Robotframework Selenium2Library Java
     Press Key    elementById=gbqfq    \\13
-    Wait Until Element Is Visible    xpath=//a[contains(.,'markusbernhardt')]
+    Wait Until Element Is Visible    xpath=//a[contains(.,'MarkusBernhardt')]
     Capture Page Screenshot
 
 Search With JavaScript Locator And Delimiter
@@ -36,7 +36,7 @@ Search With JavaScript Locator Text
 Search Without Locator Type
     Input Text    gbqfq    Robotframework Selenium2Library Java
     Press Key    gbqfq    \\13
-    Wait Until Element Is Visible    //a[contains(.,'markusbernhardt')]
+    Wait Until Element Is Visible    //a[contains(.,'MarkusBernhardt')]
 
 Get Id Of Active Element With JavaScript
     Input Text    gbqfq    Robotframework Selenium2Library

src/test/robotframework/testsuites/UnitTests/JSEvents.txt

@@ -9,6 +9,7 @@ ${URL Application}     http://fiddle.jshell.net/ShPVX/show/
 *** Keywords ***
 Open Page
     Open Browser    ${URL Application}
+    Select Frame  xpath=//iframe
     Wait Until Page Contains Element    xpath=//select[@name='test']
 
 *** Test Cases ***