refactoring ios

Author: ftheofil

env.properties

@@ -65,4 +65,4 @@ execution.environment=browserstack
 
 # CI Environment Selector
 # locally or githubactions
-ci.environment=locally
+ci.environment=githubactions

log/browserstack-javaagent.debug.log

@@ -105,3 +105,57 @@
 11:06:31.484 [ApplicationImpl pooled thread 179] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
 11:06:31.484 [ApplicationImpl pooled thread 179] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
 11:06:31.484 [ApplicationImpl pooled thread 179] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+12:21:25.040 [ApplicationImpl pooled thread 289] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+12:21:25.040 [ApplicationImpl pooled thread 289] INFO  com.browserstack.sdk.utils.Helpers - true
+12:21:25.041 [ApplicationImpl pooled thread 289] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:21:25.041 [ApplicationImpl pooled thread 289] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:21:25.041 [ApplicationImpl pooled thread 289] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+12:21:25.041 [ApplicationImpl pooled thread 289] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+12:28:20.574 [ApplicationImpl pooled thread 307] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+12:28:20.574 [ApplicationImpl pooled thread 307] INFO  com.browserstack.sdk.utils.Helpers - true
+12:28:20.576 [ApplicationImpl pooled thread 307] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:28:20.576 [ApplicationImpl pooled thread 307] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:28:20.576 [ApplicationImpl pooled thread 307] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+12:28:20.576 [ApplicationImpl pooled thread 307] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+12:39:22.701 [ApplicationImpl pooled thread 338] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+12:39:22.701 [ApplicationImpl pooled thread 338] INFO  com.browserstack.sdk.utils.Helpers - true
+12:39:22.703 [ApplicationImpl pooled thread 338] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:39:22.703 [ApplicationImpl pooled thread 338] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:39:22.703 [ApplicationImpl pooled thread 338] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+12:39:22.703 [ApplicationImpl pooled thread 338] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+12:42:29.568 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+12:42:29.568 [ApplicationImpl pooled thread 318] INFO  com.browserstack.sdk.utils.Helpers - true
+12:42:29.570 [ApplicationImpl pooled thread 318] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:42:29.570 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:42:29.570 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+12:42:29.570 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+12:49:10.189 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+12:49:10.189 [ApplicationImpl pooled thread 318] INFO  com.browserstack.sdk.utils.Helpers - true
+12:49:10.192 [ApplicationImpl pooled thread 318] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:49:10.193 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:49:10.193 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+12:49:10.193 [ApplicationImpl pooled thread 318] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+12:57:06.357 [ApplicationImpl pooled thread 375] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+12:57:06.357 [ApplicationImpl pooled thread 375] INFO  com.browserstack.sdk.utils.Helpers - true
+12:57:06.359 [ApplicationImpl pooled thread 375] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:57:06.359 [ApplicationImpl pooled thread 375] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+12:57:06.359 [ApplicationImpl pooled thread 375] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+12:57:06.359 [ApplicationImpl pooled thread 375] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+13:01:15.363 [ApplicationImpl pooled thread 370] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+13:01:15.363 [ApplicationImpl pooled thread 370] INFO  com.browserstack.sdk.utils.Helpers - true
+13:01:15.365 [ApplicationImpl pooled thread 370] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+13:01:15.366 [ApplicationImpl pooled thread 370] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+13:01:15.366 [ApplicationImpl pooled thread 370] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+13:01:15.366 [ApplicationImpl pooled thread 370] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+13:04:06.700 [ApplicationImpl pooled thread 391] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+13:04:06.701 [ApplicationImpl pooled thread 391] INFO  com.browserstack.sdk.utils.Helpers - true
+13:04:06.703 [ApplicationImpl pooled thread 391] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+13:04:06.703 [ApplicationImpl pooled thread 391] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+13:04:06.703 [ApplicationImpl pooled thread 391] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+13:04:06.703 [ApplicationImpl pooled thread 391] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC
+13:06:43.982 [ApplicationImpl pooled thread 383] INFO  c.b.s.l.BrowserStackRunExtension - cucumber java
+13:06:43.983 [ApplicationImpl pooled thread 383] INFO  com.browserstack.sdk.utils.Helpers - true
+13:06:43.985 [ApplicationImpl pooled thread 383] INFO  com.browserstack.sdk.utils.Helpers - C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+13:06:43.985 [ApplicationImpl pooled thread 383] INFO  c.b.s.l.BrowserStackRunExtension - Agent path: C:/Users/ftheofil/.m2/repository/com/browserstack/browserstack-java-sdk/1.50.4/browserstack-java-sdk-1.50.4.jar
+13:06:43.985 [ApplicationImpl pooled thread 383] INFO  c.b.s.l.BrowserStackRunExtension - Adding Browserstack SDK javaagent argline
+13:06:43.985 [ApplicationImpl pooled thread 383] INFO  c.b.s.l.BrowserStackRunExtension - Plugin version: 2.0.4-IC

log/browserstack-javaagent.log

@@ -2657,3 +2657,6 @@ issuanceAndPresentationScenariosMdl_IOS=98c5a9cb769dea3efce1b713a042551e7ce9c367
 issuanceAndPresentationScenariosMdl_IOS=fe15b658383d963681fd4438d51543a9696fbe06
 issuanceAndPresentationScenariosMdl_IOS=f1a538e8d057c88ebc890ab30a1c7020ed5d423f
 issuanceAndPresentationScenariosMdl_IOS=706f531f515e30a2ff2749ac506e1160c5525cf0
+issuanceAndPresentationScenariosMdl_IOS=46f1ae22bb3fc0bf042eb4c0df1beb5150cf5b3b
+issuanceAndPresentationScenariosMdl_IOS=17791042654843d0f040d1285652d323f368f8af
+issuanceAndPresentationScenariosMdl_IOS=6a11339ff9501fb1d0f59460ac7ccc4c0a9cd9ff

logs/browserstack-plugin.log

@@ -83,7 +83,8 @@ enum Verifier{
     enum General{
         ANDROID("android"),
 
-        IOS("ios_execution_with_browserstack.yml");
+        IOS("ios_execution_with_browserstack.yml"),
+        WEB_DRIVER_NOT_INSTANCE_APPIUM_MESSAGE("WebDriver is not an instance of AppiumDriver");
         public final String label;
         General(String label) {
             this.label = label;

session_map.txt

@@ -906,7 +906,7 @@ public void scrollUntilAuthorize() throws InterruptedException {
         } else {
             IOSDriver driver = (IOSDriver) test.mobileWebDriverFactory().getDriverIos();
             int i = 1;
-            while (i < 5) {
+            while (i < 4) {
                 WebElement scrollView = driver.findElement(AppiumBy.className("XCUIElementTypeScrollView"));
                 String elementId = ((RemoteWebElement) scrollView).getId();
                 Map<String, Object> params = new HashMap<>();

src/test/java/eu/europa/eudi/data/Literals.java

@@ -11,6 +11,8 @@
 import io.appium.java_client.*;
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.ios.IOSDriver;
+import io.appium.java_client.touch.WaitOptions;
+import io.appium.java_client.touch.offset.PointOption;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.openqa.selenium.*;
@@ -1120,35 +1122,33 @@ public void scrollUntilmDLOnDocuments() throws InterruptedException {
             String env = envDataConfig.getExecutionEnvironment();
             if (env.equalsIgnoreCase("browserstack")) {
                 IOSDriver driver = (IOSDriver) test.mobileWebDriverFactory().getDriverIos();
-                for (int i = 0; i < 22; i++) {
-                    try {
-                        WebElement mdlElement = driver.findElement(eu.europa.eudi.elements.ios.WalletElements.clickMdl);
-                        if (mdlElement.isDisplayed()) {
-                            break;
-                        }
-                    } catch (Exception e) {
-                        // element not visible yet, continue scrolling
+                for (int i = 0; i < 22; i++) {  // reduce from 22 → 10
+
+                    if (isElementVisible(driver)) {
+                        break;
                     }
-                    // Get screen size
+
                     Dimension size = driver.manage().window().getSize();
                     int startX = size.width / 2;
-                    int startY = (int) (size.height * 0.6);
-                    int endY = (int) (size.height * 0.5);
-                    // --- START: REPLACEMENT FOR TouchAction ---
+                    int startY = (int) (size.height * 0.7);
+                    int endY = (int) (size.height * 0.3);
+
                     PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger");
                     Sequence swipe = new Sequence(finger, 1);
 
-                    swipe.addAction(finger.createPointerMove(Duration.ofMillis(0), PointerInput.Origin.viewport(), startX, startY));
+                    swipe.addAction(finger.createPointerMove(Duration.ZERO,
+                            PointerInput.Origin.viewport(), startX, startY));
                     swipe.addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()));
-                    swipe.addAction(new Pause(finger, Duration.ofMillis(500)));
-                    // This replaces your waitAction
-                    swipe.addAction(finger.createPointerMove(Duration.ofMillis(250), PointerInput.Origin.viewport(), startX, endY));
+                    swipe.addAction(new Pause(finger, Duration.ofMillis(80))); // smaller pause
+                    swipe.addAction(finger.createPointerMove(Duration.ofMillis(120),
+                            PointerInput.Origin.viewport(), startX, endY));
                     swipe.addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
 
                     driver.perform(Collections.singletonList(swipe));
-                    // --- END: REPLACEMENT FOR TouchAction ---// Optional: Add a short pause between swipes
-                    Thread.sleep(50);
+
+                    // ⚡ no Thread.sleep (big speed gain)
                 }
+
             } else {
                 IOSDriver driver = (IOSDriver) test.mobileWebDriverFactory().getDriverIos();
                 for (int i = 0; i < 6; i++) {
@@ -1184,6 +1184,11 @@ public void scrollUntilmDLOnDocuments() throws InterruptedException {
         }
     }
 
+    private boolean isElementVisible(IOSDriver driver) {
+        return !driver.findElements(eu.europa.eudi.elements.ios.WalletElements.clickMdl).isEmpty()
+                && driver.findElements(eu.europa.eudi.elements.ios.WalletElements.clickMdl).get(0).isDisplayed();
+    }
+
     public void scrollUntilPIDTwoPid() throws InterruptedException {
         if (test.getSystemOperation().equals(Literals.General.ANDROID.label)) {
             AndroidDriver driver = (AndroidDriver) test.mobileWebDriverFactory().getDriverAndroid();