Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocr_actions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.testsigma.addons</groupId>
<artifactId>ocr_actions</artifactId>
<version>1.1.8</version>
<version>1.1.9</version>
<packaging>jar</packaging>

<properties>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package com.testsigma.addons.android;

import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.io.*;

import org.apache.commons.lang3.exception.ExceptionUtils;
import org.openqa.selenium.By;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.interactions.PointerInput;
import org.openqa.selenium.interactions.Sequence;

import com.testsigma.sdk.AndroidAction;
import com.testsigma.sdk.ApplicationType;
Expand All @@ -20,10 +21,7 @@
import com.testsigma.sdk.annotation.OCR;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down Expand Up @@ -107,7 +105,12 @@ public void clickOnCoordinates(OCRTextPoint textPoint) {
logger.info("Clicking on X coordinate: " + x + "\n");
logger.info("Clicking on Y coordinate: " + y + "\n");

TouchAction action = new TouchAction((PerformsTouchActions) (AndroidDriver)this.driver);
action.tap(PointOption.point(x, y)).perform();
// Using W3C Actions API instead of deprecated TouchAction
PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger");
Sequence tap = new Sequence(finger, 1);
tap.addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), x, y));
tap.addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()));
tap.addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
((AndroidDriver) this.driver).perform(Arrays.asList(tap));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
import java.io.*;

import org.apache.commons.lang3.exception.ExceptionUtils;
import org.openqa.selenium.By;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;

import com.testsigma.sdk.AndroidAction;
import com.testsigma.sdk.ApplicationType;
Expand All @@ -21,10 +18,7 @@
import com.testsigma.sdk.annotation.RunTimeData;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.testsigma.addons.android;

import java.io.File;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.commons.lang3.exception.ExceptionUtils;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.interactions.PointerInput;
import org.openqa.selenium.interactions.Sequence;

import com.testsigma.sdk.AndroidAction;
import com.testsigma.sdk.ApplicationType;
Expand All @@ -18,11 +21,7 @@
import com.testsigma.sdk.annotation.OCR;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down Expand Up @@ -93,7 +92,12 @@ public void clickOnCoordinates(OCRTextPoint textPoint) {
logger.info("Clicking on X coordinate: " + x + "\n");
logger.info("Clicking on Y coordinate: " + y + "\n");

TouchAction action = new TouchAction((PerformsTouchActions) (AndroidDriver)this.driver);
action.tap(PointOption.point(x, y)).perform();
// Using W3C Actions API instead of deprecated TouchAction
PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger");
Sequence tap = new Sequence(finger, 1);
tap.addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), x, y));
tap.addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()));
tap.addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
((AndroidDriver) this.driver).perform(Arrays.asList(tap));
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.testsigma.addons.android;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.io.*;
import java.time.Duration;

import org.apache.commons.lang3.exception.ExceptionUtils;
import org.openqa.selenium.By;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.interactions.PointerInput;
import org.openqa.selenium.interactions.Sequence;

import com.testsigma.sdk.AndroidAction;
import com.testsigma.sdk.ApplicationType;
Expand All @@ -21,13 +21,7 @@
import com.testsigma.sdk.annotation.OCR;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.touch.TapOptions;
import io.appium.java_client.touch.WaitOptions;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down Expand Up @@ -109,12 +103,16 @@ public void clickOnCoordinates(OCRTextPoint textPoint) throws InterruptedExcepti
logger.info("Clicking on X coordinate: " + x + "\n");
logger.info("Clicking on Y coordinate: " + y + "\n");

TouchAction action = new TouchAction((PerformsTouchActions) (AndroidDriver)this.driver);
// Using W3C Actions API instead of deprecated TouchAction
PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger");
Sequence tap = new Sequence(finger, 1);
logger.info("Pressing X coordinate: " + x + "\n");
PointOption point = PointOption.point(x, y);
logger.info("Pressing Y coordinate: " + y + "\n");
// Perform the move and tap action
action.moveTo(point).tap(point).perform();
// Perform the move and tap action
tap.addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), x, y));
tap.addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()));
tap.addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
((AndroidDriver) this.driver).perform(Arrays.asList(tap));
logger.info("Successfully pressed X and y coordinate: " + x + "\n" + y + "\n");
}
}
21 changes: 11 additions & 10 deletions ocr_actions/src/main/java/com/testsigma/addons/ios/OCRTesting.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.testsigma.addons.ios;

import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.io.*;

import org.apache.commons.lang3.exception.ExceptionUtils;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.interactions.PointerInput;
import org.openqa.selenium.interactions.Sequence;

import com.testsigma.sdk.ApplicationType;
import com.testsigma.sdk.IOSAction;
Expand All @@ -18,11 +21,7 @@
import com.testsigma.sdk.annotation.OCR;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down Expand Up @@ -102,10 +101,12 @@ public void clickOnCoordinates(OCRTextPoint textPoint) {
logger.info("Clicking on X coordinate: " + x + "\n");
logger.info("Clicking on Y coordinate: " + y + "\n");

TouchAction action = new TouchAction((IOSDriver)this.driver);
action.tap(PointOption.point(x,y)).perform();

// TouchAction action = new TouchAction((PerformsTouchActions) (IOSDriver)this.driver);
// action.tap(PointOption.point(x, y)).perform();
// Using W3C Actions API instead of deprecated TouchAction
PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger");
Sequence tap = new Sequence(finger, 1);
tap.addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), x, y));
tap.addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()));
tap.addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
((IOSDriver) this.driver).perform(Arrays.asList(tap));
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.testsigma.addons.ios;

import java.io.File;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.commons.lang3.exception.ExceptionUtils;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.interactions.PointerInput;
import org.openqa.selenium.interactions.Sequence;

import com.testsigma.sdk.ApplicationType;
import com.testsigma.sdk.IOSAction;
Expand All @@ -18,11 +21,7 @@
import com.testsigma.sdk.annotation.OCR;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down Expand Up @@ -89,10 +88,12 @@ public void clickOnCoordinates(OCRTextPoint textPoint) {
logger.info("Clicking on X coordinate: " + x + "\n");
logger.info("Clicking on Y coordinate: " + y + "\n");

TouchAction action = new TouchAction((IOSDriver)this.driver);
action.tap(PointOption.point(x,y)).perform();

//TouchAction action = new TouchAction((PerformsTouchActions) (IOSDriver)this.driver);
//action.tap(PointOption.point(x, y)).perform();
// Using W3C Actions API instead of deprecated TouchAction
PointerInput finger = new PointerInput(PointerInput.Kind.TOUCH, "finger");
Sequence tap = new Sequence(finger, 1);
tap.addAction(finger.createPointerMove(Duration.ZERO, PointerInput.Origin.viewport(), x, y));
tap.addAction(finger.createPointerDown(PointerInput.MouseButton.LEFT.asArg()));
tap.addAction(finger.createPointerUp(PointerInput.MouseButton.LEFT.asArg()));
((IOSDriver) this.driver).perform(Arrays.asList(tap));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
import com.testsigma.sdk.annotation.OCR;
import com.testsigma.sdk.annotation.TestData;

import io.appium.java_client.PerformsTouchActions;
import io.appium.java_client.TouchAction;
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.touch.offset.PointOption;
import lombok.Data;

@Data
Expand Down
Loading