diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..55fa79f Binary files /dev/null and b/.DS_Store differ diff --git a/StartUsingWebDriver.iml b/StartUsingWebDriver.iml index 41cf146..990d99b 100644 --- a/StartUsingWebDriver.iml +++ b/StartUsingWebDriver.iml @@ -1,6 +1,6 @@ - + @@ -19,30 +19,25 @@ - - - - - - - - - + + + + + + + + + - - - - + - + + - - - - - - - + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d79676c..26eeb1b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.itnove.trainings.webdriver StartUsingWebDriver - 17.09.12 + 19.02.19 @@ -22,14 +21,14 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 8 + 8 jar - JunitMaven + startUsingTestNG http://maven.apache.org UTF-8 @@ -43,17 +42,17 @@ org.seleniumhq.selenium selenium-java - 3.7.1 + 3.141.59 org.seleniumhq.selenium selenium-firefox-driver - 3.7.1 + 3.141.59 org.seleniumhq.selenium selenium-chrome-driver - 3.5.3 + 3.141.59 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..2e19fb0 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000..1d584f8 Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/resources/chromedriver-linux b/src/main/resources/chromedriver-linux index adba49a..3ab2332 100755 Binary files a/src/main/resources/chromedriver-linux and b/src/main/resources/chromedriver-linux differ diff --git a/src/main/resources/chromedriver-macos b/src/main/resources/chromedriver-macos index 5428aa4..6b160b9 100755 Binary files a/src/main/resources/chromedriver-macos and b/src/main/resources/chromedriver-macos differ diff --git a/src/main/resources/chromedriver.exe b/src/main/resources/chromedriver.exe new file mode 100644 index 0000000..c89a033 Binary files /dev/null and b/src/main/resources/chromedriver.exe differ diff --git a/src/main/resources/geckodriver-linux b/src/main/resources/geckodriver-linux index b8d586b..bac836b 100755 Binary files a/src/main/resources/geckodriver-linux and b/src/main/resources/geckodriver-linux differ diff --git a/src/main/resources/geckodriver-macos b/src/main/resources/geckodriver-macos index bbcf216..bcec190 100755 Binary files a/src/main/resources/geckodriver-macos and b/src/main/resources/geckodriver-macos differ diff --git a/src/main/resources/geckodriver.exe b/src/main/resources/geckodriver.exe new file mode 100755 index 0000000..1aba699 Binary files /dev/null and b/src/main/resources/geckodriver.exe differ diff --git a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java index 7704657..a610284 100644 --- a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java @@ -32,14 +32,14 @@ public class BaseTest { DesiredCapabilities capabilities; if (browser != null && browser.equalsIgnoreCase("chrome")) { capabilities = DesiredCapabilities.chrome(); - System.setProperty("webdriver.chrome.driver", "src" + File.separator + "main" + File.separator + "resources" + File.separator + "chromedriver-linux"); + System.setProperty("webdriver.chrome.driver", "src" + File.separator + "main" + File.separator + "resources" + File.separator + "chromedriver-macos"); driver = new ChromeDriver(capabilities); } else { capabilities = DesiredCapabilities.firefox(); System.setProperty("webdriver.gecko.driver", "src" + File.separator + "main" + File.separator + "resources" - + File.separator + "geckodriver-linux"); + + File.separator + "geckodriver-macos"); driver = new FirefoxDriver(capabilities); } //driver = new RemoteWebDriver(new URL("http://0.0.0.0:4444/wd/hub"), capabilities); diff --git a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java index 29484cc..c17221b 100644 --- a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java @@ -32,7 +32,7 @@ public class JWPlayer extends BaseTest { * @throws InterruptedException */ protected void waitForPlayer(WebDriver driver) throws InterruptedException { - wait.pause(2000); + wait.pauseMilliseconds(2000); (new WebDriverWait(driver, 10)).until(new ExpectedCondition() { public Boolean apply(WebDriver d) { return (executor.executeScript("return jwplayer().getState()") != null); @@ -185,7 +185,7 @@ public class JWPlayer extends BaseTest { public boolean assertStatePause() throws InterruptedException { waitForPlayer(driver); - executor.executeScript("jwplayer().pause()"); + executor.executeScript("jwplayer().pauseMilliseconds()"); System.out.println(executor.executeScript("return jwplayer().getState()")); return executor.executeScript("return jwplayer().getState()").equals("buffering") || executor.executeScript("return jwplayer().getState()").equals("paused"); diff --git a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java index f691515..3ea217a 100644 --- a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java @@ -197,7 +197,7 @@ public class LocalNavigationActions extends Locators { LocalRemoteWebDriverWait wait) { int i = 0; while (!WebElementExists(driver, element) && i < 20) { - wait.pause(1000); + wait.pauseMilliseconds(1000); i++; } return WebElementExists(driver, element); diff --git a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java index b34bd31..08c0a81 100644 --- a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java @@ -7,9 +7,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.*; import java.util.Arrays; - -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.TimeUnit.SECONDS; +import java.util.concurrent.TimeUnit; /** * Wraps LocalRemoteWebDriverWait to be used in a more convenient way and adds functionality. @@ -121,10 +119,6 @@ public class LocalRemoteWebDriverWait extends WebDriverWait { until(ExpectedConditions.stalenessOf(element)); } - public void forTextPresent(By locator, String text) { - until(ExpectedConditions.textToBePresentInElement(locator, text)); - } - public void forTextPresentInElementValue(By locator, String text) { until(ExpectedConditions.textToBePresentInElementValue(locator, text)); } @@ -142,7 +136,7 @@ public class LocalRemoteWebDriverWait extends WebDriverWait { if (e.getAttribute(textValue) != null) { return Boolean.valueOf(e.getAttribute(textValue)); } - pause(milliseconds); + pauseMilliseconds(milliseconds); } return Boolean.valueOf(null); } @@ -185,9 +179,9 @@ public class LocalRemoteWebDriverWait extends WebDriverWait { return pageLoaded; } - public void pause(long milliseconds) { + public void pauseMilliseconds(long milliseconds) { try { - Sleeper.SYSTEM_SLEEPER.sleep(new Duration(milliseconds, MILLISECONDS)); + TimeUnit.MILLISECONDS.sleep(milliseconds); } catch (InterruptedException ie) { System.out.println("Waiting finished during " + milliseconds + " milliseconds "); } @@ -195,7 +189,7 @@ public class LocalRemoteWebDriverWait extends WebDriverWait { public void pauseSeconds(long seconds) { try { - Sleeper.SYSTEM_SLEEPER.sleep(new Duration(seconds, SECONDS)); + TimeUnit.SECONDS.sleep(seconds); } catch (InterruptedException ie) { System.out.println("Waiting finished during " + seconds + " seconds "); }