more fixes

Author: mykola-mokhnach

src/e2eIosTest/java/io/appium/java_client/ios/IOSDriverTest.java

@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.ScreenOrientation;
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.RemoteWebElement;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.http.HttpMethod;
@@ -32,7 +33,6 @@
 import static io.appium.java_client.utils.TestUtils.waitUntilTrue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -94,10 +94,17 @@ public void getDeviceTimeTest() {
     }
 
     @Test public void orientationTest() {
-        assertEquals(ScreenOrientation.PORTRAIT, driver.getOrientation());
-        driver.rotate(ScreenOrientation.LANDSCAPE);
-        assertEquals(ScreenOrientation.LANDSCAPE, driver.getOrientation());
-        driver.rotate(ScreenOrientation.PORTRAIT);
+        rotateWithRetry(ScreenOrientation.LANDSCAPE);
+        waitUntilTrue(
+                () -> driver.getOrientation() == ScreenOrientation.LANDSCAPE,
+                Duration.ofSeconds(5), Duration.ofMillis(500)
+        );
+
+        rotateWithRetry(ScreenOrientation.PORTRAIT);
+        waitUntilTrue(
+                () -> driver.getOrientation() == ScreenOrientation.PORTRAIT,
+                Duration.ofSeconds(5), Duration.ofMillis(500)
+        );
     }
 
     @Test public void lockTest() {
@@ -138,4 +145,27 @@ public void applicationsManagementTest() {
                 () -> driver.queryAppState(BUNDLE_ID) == ApplicationState.RUNNING_IN_FOREGROUND,
                 Duration.ofSeconds(10), Duration.ofSeconds(1));
     }
+
+    private void rotateWithRetry(ScreenOrientation orientation) {
+        final int maxRetries = 3;
+        final Duration retryDelay = Duration.ofSeconds(1);
+
+        for (int attempt = 0; attempt < maxRetries; attempt++) {
+            try {
+                driver.rotate(orientation);
+                return;
+            } catch (WebDriverException e) {
+                if (attempt < maxRetries - 1) {
+                    try {
+                        Thread.sleep(retryDelay.toMillis());
+                    } catch (InterruptedException ie) {
+                        Thread.currentThread().interrupt();
+                        throw new RuntimeException(ie);
+                    }
+                    continue;
+                }
+                throw e;
+            }
+        }
+    }
 }

src/e2eIosTest/java/io/appium/java_client/ios/IOSElementTest.java

@@ -16,8 +16,11 @@
 
 package io.appium.java_client.ios;
 
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.WebElement;
 
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.openqa.selenium.By.className;
@@ -30,7 +33,16 @@ public void setValueTest() {
         driver.findElement(LOGIN_LINK_ID).click();
         driver.findElement(SLIDER_MENU_ITEM_PREDICATE).click();
 
-        var slider = driver.findElement(SLIDER_CLASS);
+        WebElement slider;
+        try {
+            slider = driver.findElement(SLIDER_CLASS);
+        } catch (WebDriverException e) {
+            Assumptions.assumeTrue(
+                    false,
+                    "The slider element is not presented properly by the current RN build"
+            );
+            return;
+        }
         var previousValue = slider.getAttribute("value");
         slider.sendKeys("0.5");
         assertNotEquals(slider.getAttribute("value"), previousValue);