From 862c7ef93c555f33b9545ea8e5b3325c5a239393 Mon Sep 17 00:00:00 2001 From: WasiqB Date: Mon, 19 Aug 2019 22:44:46 +0530 Subject: [PATCH 1/3] Upgraded Selenium version to alpha 2. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5a9863788..e81296a9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ signing.secretKeyRingFile=PathToYourKeyRingFile ossrhUsername=your-jira-id ossrhPassword=your-jira-password -selenium.version=4.0.0-alpha-1 +selenium.version=4.0.0-alpha-2 From 55907f22775feb2792383d25a2543c8e7e8d0a4b Mon Sep 17 00:00:00 2001 From: WasiqB Date: Mon, 19 Aug 2019 23:33:18 +0530 Subject: [PATCH 2/3] Updated for changes for Selenium alpha 2. --- .../java_client/android/OpenNotificationsTest.java | 3 ++- .../io/appium/java_client/android/UIAutomator2Test.java | 9 +++++---- .../element/generation/ios/IOSElementGenerationTest.java | 5 +++-- .../java/io/appium/java_client/ios/IOSAlertTest.java | 3 ++- .../java/io/appium/java_client/ios/IOSDriverTest.java | 9 +++++---- .../java/io/appium/java_client/ios/IOSElementTest.java | 3 ++- .../java_client/ios/IOSNativeWebTapSettingTest.java | 7 ++++--- .../java/io/appium/java_client/ios/IOSTouchTest.java | 4 ++-- .../java/io/appium/java_client/ios/IOSWebViewTest.java | 7 +++++-- .../java_client/pagefactory_tests/XCUITModeTest.java | 3 ++- 10 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java index 7806ecc14..d6af69d05 100644 --- a/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java +++ b/src/test/java/io/appium/java_client/android/OpenNotificationsTest.java @@ -1,5 +1,6 @@ package io.appium.java_client.android; +import static java.time.Duration.ofSeconds; import static org.junit.Assert.assertNotEquals; import static org.openqa.selenium.By.id; @@ -14,7 +15,7 @@ public class OpenNotificationsTest extends BaseAndroidTest { public void openNotification() { driver.closeApp(); driver.openNotifications(); - WebDriverWait wait = new WebDriverWait(driver, 20); + WebDriverWait wait = new WebDriverWait(driver, ofSeconds(20)); assertNotEquals(0, wait.until(input -> { List result = input .findElements(id("com.android.systemui:id/settings_button")); diff --git a/src/test/java/io/appium/java_client/android/UIAutomator2Test.java b/src/test/java/io/appium/java_client/android/UIAutomator2Test.java index 19df3618a..bca878dda 100644 --- a/src/test/java/io/appium/java_client/android/UIAutomator2Test.java +++ b/src/test/java/io/appium/java_client/android/UIAutomator2Test.java @@ -1,5 +1,6 @@ package io.appium.java_client.android; +import static java.time.Duration.ofSeconds; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -23,7 +24,7 @@ public void afterMethod() { @Test public void testLandscapeRightRotation() { - new WebDriverWait(driver, 20).until(ExpectedConditions + new WebDriverWait(driver, ofSeconds(20)).until(ExpectedConditions .elementToBeClickable(driver.findElementById("android:id/content") .findElement(MobileBy.AccessibilityId("Graphics")))); DeviceRotation landscapeRightRotation = new DeviceRotation(0, 0, 90); @@ -33,7 +34,7 @@ public void testLandscapeRightRotation() { @Test public void testLandscapeLeftRotation() { - new WebDriverWait(driver, 20).until(ExpectedConditions + new WebDriverWait(driver, ofSeconds(20)).until(ExpectedConditions .elementToBeClickable(driver.findElementById("android:id/content") .findElement(MobileBy.AccessibilityId("Graphics")))); DeviceRotation landscapeLeftRotation = new DeviceRotation(0, 0, 270); @@ -43,7 +44,7 @@ public void testLandscapeLeftRotation() { @Test public void testPortraitUpsideDown() { - new WebDriverWait(driver, 20).until(ExpectedConditions + new WebDriverWait(driver, ofSeconds(20)).until(ExpectedConditions .elementToBeClickable(driver.findElementById("android:id/content") .findElement(MobileBy.AccessibilityId("Graphics")))); DeviceRotation landscapeRightRotation = new DeviceRotation(0, 0, 180); @@ -56,7 +57,7 @@ public void testPortraitUpsideDown() { */ @Ignore public void testToastMSGIsDisplayed() { - final WebDriverWait wait = new WebDriverWait(driver, 30); + final WebDriverWait wait = new WebDriverWait(driver, ofSeconds(30)); Activity activity = new Activity("io.appium.android.apis", ".view.PopupMenu1"); driver.startActivity(activity); diff --git a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java index 0b7572be3..7ed8832e5 100644 --- a/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java +++ b/src/test/java/io/appium/java_client/appium/element/generation/ios/IOSElementGenerationTest.java @@ -1,6 +1,7 @@ package io.appium.java_client.appium.element.generation.ios; import static io.appium.java_client.MobileBy.AccessibilityId; +import static java.time.Duration.ofSeconds; import static org.junit.Assert.assertTrue; import static org.openqa.selenium.By.id; import static org.openqa.selenium.By.name; @@ -84,11 +85,11 @@ public void whenIOSHybridAppIsLaunched() { Capabilities caps = commonAppCapabilitiesSupplier.get(); return caps.merge(appFileSupplierFunction.apply(webViewApp).get()); }, (by, aClass) -> { - new WebDriverWait(driver, 30) + new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.presenceOfElementLocated(id("login"))) .click(); driver.findElementByAccessibilityId("webView").click(); - new WebDriverWait(driver, 30) + new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions .presenceOfElementLocated(AccessibilityId("Webview"))); try { diff --git a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java index 06df51bd7..7c46a3c4d 100644 --- a/src/test/java/io/appium/java_client/ios/IOSAlertTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSAlertTest.java @@ -16,6 +16,7 @@ package io.appium.java_client.ios; +import static java.time.Duration.ofSeconds; import static junit.framework.TestCase.assertFalse; import static org.junit.Assert.assertTrue; import static org.openqa.selenium.support.ui.ExpectedConditions.alertIsPresent; @@ -32,7 +33,7 @@ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class IOSAlertTest extends AppIOSTest { - private WebDriverWait waiting = new WebDriverWait(driver, 10000); + private WebDriverWait waiting = new WebDriverWait(driver, ofSeconds(10000)); private static final String iOSAutomationText = "show alert"; @Test public void acceptAlertTest() { diff --git a/src/test/java/io/appium/java_client/ios/IOSDriverTest.java b/src/test/java/io/appium/java_client/ios/IOSDriverTest.java index 995ac4c58..69056af48 100644 --- a/src/test/java/io/appium/java_client/ios/IOSDriverTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSDriverTest.java @@ -16,6 +16,7 @@ package io.appium.java_client.ios; +import static java.time.Duration.ofSeconds; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -56,7 +57,7 @@ public void getDeviceTimeTest() { } @Test public void hideKeyboardWithParametersTest() { - new WebDriverWait(driver, 30) + new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.presenceOfElementLocated(By.id("IntegerA"))) .click(); driver.hideKeyboard(HideKeyboardStrategy.PRESS_KEY, "Done"); @@ -102,7 +103,7 @@ public void getDeviceTimeTest() { @Test public void putAppIntoBackgroundAndRestoreTest() { final long msStarted = System.currentTimeMillis(); - driver.runAppInBackground(Duration.ofSeconds(4)); + driver.runAppInBackground(ofSeconds(4)); assertThat(System.currentTimeMillis() - msStarted, greaterThan(3000L)); } @@ -119,7 +120,7 @@ public void getDeviceTimeTest() { } assertThat(driver.queryAppState(BUNDLE_ID), equalTo(ApplicationState.RUNNING_IN_FOREGROUND)); Thread.sleep(500); - driver.runAppInBackground(Duration.ofSeconds(-1)); + driver.runAppInBackground(ofSeconds(-1)); assertThat(driver.queryAppState(BUNDLE_ID), lessThan(ApplicationState.RUNNING_IN_FOREGROUND)); Thread.sleep(500); driver.activateApp(BUNDLE_ID); @@ -128,7 +129,7 @@ public void getDeviceTimeTest() { @Test public void putAIntoBackgroundWithoutRestoreTest() { assertThat(driver.findElementsById("IntegerA"), is(not(empty()))); - driver.runAppInBackground(Duration.ofSeconds(-1)); + driver.runAppInBackground(ofSeconds(-1)); assertThat(driver.findElementsById("IntegerA"), is(empty())); driver.launchApp(); } diff --git a/src/test/java/io/appium/java_client/ios/IOSElementTest.java b/src/test/java/io/appium/java_client/ios/IOSElementTest.java index 4389d1888..18bbf0d69 100644 --- a/src/test/java/io/appium/java_client/ios/IOSElementTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSElementTest.java @@ -1,5 +1,6 @@ package io.appium.java_client.ios; +import static java.time.Duration.ofSeconds; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertEquals; @@ -25,7 +26,7 @@ public void findByAccessibilityIdTest() { @Ignore @Test public void setValueTest() { - WebDriverWait wait = new WebDriverWait(driver, 20); + WebDriverWait wait = new WebDriverWait(driver, ofSeconds(20)); IOSElement slider = wait.until( driver1 -> driver1.findElement(By.className("XCUIElementTypeSlider"))); diff --git a/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java b/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java index cc23af210..25f287bc5 100644 --- a/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSNativeWebTapSettingTest.java @@ -1,5 +1,6 @@ package io.appium.java_client.ios; +import static java.time.Duration.ofSeconds; import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -16,17 +17,17 @@ public class IOSNativeWebTapSettingTest extends BaseSafariTest { driver.nativeWebTap(true); WebElement el = driver.findElementById("i am a link"); el.click(); - assertTrue(new WebDriverWait(driver, 30) + assertTrue(new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.titleIs("I am another page title - Sauce Labs"))); driver.navigate().back(); // now do a click with it turned off and assert the same behavior - assertTrue(new WebDriverWait(driver, 30) + assertTrue(new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.titleIs("I am a page title - Sauce Labs"))); driver.nativeWebTap(false); el = driver.findElementById("i am a link"); el.click(); - assertTrue(new WebDriverWait(driver, 30) + assertTrue(new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.titleIs("I am another page title - Sauce Labs"))); } } diff --git a/src/test/java/io/appium/java_client/ios/IOSTouchTest.java b/src/test/java/io/appium/java_client/ios/IOSTouchTest.java index ea2f83d9d..8b6d34b04 100644 --- a/src/test/java/io/appium/java_client/ios/IOSTouchTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSTouchTest.java @@ -58,7 +58,7 @@ public void touchWithPressureTest() { } @Test public void swipeTest() { - WebDriverWait webDriverWait = new WebDriverWait(driver, 30); + WebDriverWait webDriverWait = new WebDriverWait(driver, ofSeconds(30)); IOSElement slider = webDriverWait.until(driver1 -> driver.findElementByClassName("XCUIElementTypeSlider")); Dimension size = slider.getSize(); @@ -82,7 +82,7 @@ public void touchWithPressureTest() { new MultiTouchAction(driver).add(tap1).add(tap2).perform(); - WebDriverWait waiting = new WebDriverWait(driver, 10000); + WebDriverWait waiting = new WebDriverWait(driver, ofSeconds(10000)); assertNotNull(waiting.until(alertIsPresent())); driver.switchTo().alert().accept(); } diff --git a/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java b/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java index 7c8f380c3..d12d5aa16 100644 --- a/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java +++ b/src/test/java/io/appium/java_client/ios/IOSWebViewTest.java @@ -1,5 +1,6 @@ package io.appium.java_client.ios; +import static java.time.Duration.ofSeconds; import static org.junit.Assert.assertTrue; import io.appium.java_client.MobileBy; @@ -9,14 +10,16 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; +import java.time.Duration; + public class IOSWebViewTest extends BaseIOSWebViewTest { @Test public void webViewPageTestCase() throws InterruptedException { - new WebDriverWait(driver, 30) + new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.presenceOfElementLocated(By.id("login"))) .click(); driver.findElementByAccessibilityId("webView").click(); - new WebDriverWait(driver, 30) + new WebDriverWait(driver, ofSeconds(30)) .until(ExpectedConditions.presenceOfElementLocated(MobileBy.AccessibilityId("Webview"))); findAndSwitchToWebView(); WebElement el = driver.findElementByPartialLinkText("login"); diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java index c54bf9129..cd683709b 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/XCUITModeTest.java @@ -19,6 +19,7 @@ import static io.appium.java_client.pagefactory.LocatorGroupStrategy.ALL_POSSIBLE; import static io.appium.java_client.pagefactory.LocatorGroupStrategy.CHAIN; +import static java.time.Duration.ofSeconds; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -47,7 +48,7 @@ public class XCUITModeTest extends AppIOSTest { private boolean populated = false; - private WebDriverWait waiting = new WebDriverWait(driver, 10000); + private WebDriverWait waiting = new WebDriverWait(driver, ofSeconds(10000)); @HowToUseLocators(iOSXCUITAutomation = ALL_POSSIBLE) @iOSXCUITFindBy(iOSNsPredicate = "label contains 'Compute'") From fb54edb9f6196fd4bba4a2acb1862263f6c2a753 Mon Sep 17 00:00:00 2001 From: WasiqB Date: Tue, 20 Aug 2019 20:39:56 +0530 Subject: [PATCH 3/3] Updated for compilation errors. --- .../io/appium/java_client/remote/AppiumCommandExecutor.java | 2 +- .../io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java index 3f094ff53..707680b4f 100644 --- a/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java +++ b/src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java @@ -44,10 +44,10 @@ import org.openqa.selenium.remote.ProtocolHandshake; import org.openqa.selenium.remote.Response; import org.openqa.selenium.remote.ResponseCodec; +import org.openqa.selenium.remote.codec.w3c.W3CHttpCommandCodec; import org.openqa.selenium.remote.http.HttpClient; import org.openqa.selenium.remote.http.HttpRequest; import org.openqa.selenium.remote.http.HttpResponse; -import org.openqa.selenium.remote.http.W3CHttpCommandCodec; import org.openqa.selenium.remote.service.DriverService; import java.io.BufferedInputStream; diff --git a/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java b/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java index aec7ebd75..0fe0ace05 100644 --- a/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java +++ b/src/main/java/io/appium/java_client/remote/AppiumW3CHttpCommandCodec.java @@ -32,7 +32,7 @@ import org.openqa.selenium.interactions.KeyInput; import org.openqa.selenium.interactions.Sequence; -import org.openqa.selenium.remote.http.W3CHttpCommandCodec; +import org.openqa.selenium.remote.codec.w3c.W3CHttpCommandCodec; import java.util.Collection; import java.util.Map;