From 49c17de48e13512871672b53f26f6efe5c51f864 Mon Sep 17 00:00:00 2001 From: Megha Pradeep Date: Wed, 11 Oct 2023 11:13:27 +0530 Subject: [PATCH 1/3] removed annotations, added getEyes methods, removed static from methodd and variables --- .../integration/ApplitoolsInitializer.java | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java b/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java index db645d7..d2b94c0 100644 --- a/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java +++ b/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java @@ -10,7 +10,7 @@ import org.openqa.selenium.WebDriver; import org.testng.Assert; import org.testng.ITestResult; -import org.testng.annotations.*; +import org.testng.annotations.Test; import org.testng.xml.XmlTest; import java.io.IOException; @@ -20,24 +20,35 @@ import static com.znsio.applitools.integration.ApplitoolsConfigurationManager.*; public class ApplitoolsInitializer { - private static WebDriver webDriver; - private static AppiumDriver appiumDriver; - protected com.applitools.eyes.selenium.Eyes eyesOnWeb; - protected com.applitools.eyes.appium.Eyes eyesOnApp; + private WebDriver webDriver; + private AppiumDriver appiumDriver; + private com.applitools.eyes.selenium.Eyes eyesOnWeb; + private com.applitools.eyes.appium.Eyes eyesOnApp; private static BatchInfo batch; - private static Configuration eyesConfig; - private static EyesRunner runner; + private Configuration eyesConfig; + private EyesRunner runner; private static final Logger LOGGER = Logger.getLogger(ApplitoolsInitializer.class.getName()); - public static void driverSetupForApplitoolsInitializer(WebDriver wDriver) { - webDriver = wDriver; + public void driverSetupForApplitoolsInitializer(WebDriver driver) { + if (isPlatformWeb()) { + webDriver = (WebDriver) driver; + } else { + appiumDriver = (AppiumDriver) driver; + } } - public static void driverSetupForApplitoolsInitializer(AppiumDriver aDriver) { + public void driverSetupForApplitoolsInitializer(AppiumDriver aDriver) { appiumDriver = aDriver; } - @BeforeSuite + public com.applitools.eyes.selenium.Eyes getWebEyes() { + return this.eyesOnWeb; + } + + public com.applitools.eyes.appium.Eyes getAppEyes() { + return this.eyesOnApp; + } + public void setUpApplitoolsInitializer(XmlTest suite) throws IOException, RuntimeException { LOGGER.info("@BeforeSuite of ApplitoolsInitializer called"); @@ -53,7 +64,6 @@ public void setUpApplitoolsInitializer(XmlTest suite) throws IOException, Runtim } } - @BeforeMethod public void initiateApplitoolsInitializer(Method method) { LOGGER.info("@BeforeMethod of ApplitoolsInitializer called: " + method.getName()); if (isPlatformWeb() && isUltraFastGridEnabled()) { @@ -69,7 +79,6 @@ public void initiateApplitoolsInitializer(Method method) { } } - @AfterMethod public void closeApplitoolsInitializer(ITestResult iTestResult) { LOGGER.info("@AfterMethod of ApplitoolsInitializer called: Waiting for visual validation results of test: " + iTestResult.getName()); @@ -78,7 +87,7 @@ public void closeApplitoolsInitializer(ITestResult iTestResult) { } else { eyesOnApp.closeAsync(); } - TestResults testResult = new TestResults(); + TestResults testResult = new TestResults(); TestResultsSummary allTestResults = runner.getAllTestResults(false); TestResultContainer[] results = allTestResults.getAllResults(); LOGGER.info(String.format("Number of cross-browser tests run for test: %s: %d%n", @@ -95,7 +104,6 @@ public void closeApplitoolsInitializer(ITestResult iTestResult) { } } - @AfterSuite public void closeBatch() { LOGGER.info("@AfterSuite of ApplitoolsInitializer called: Close Visual Test batch"); batch.setCompleted(true); From 23c6a0ab88a4b785c02bccd850a47852c83147ef Mon Sep 17 00:00:00 2001 From: Megha Pradeep Date: Wed, 11 Oct 2023 23:49:05 +0530 Subject: [PATCH 2/3] combined driverSetup code into one method --- .../applitools/integration/ApplitoolsInitializer.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java b/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java index d2b94c0..5b6a7ec 100644 --- a/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java +++ b/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java @@ -31,16 +31,12 @@ public class ApplitoolsInitializer { public void driverSetupForApplitoolsInitializer(WebDriver driver) { if (isPlatformWeb()) { - webDriver = (WebDriver) driver; + webDriver = driver; } else { appiumDriver = (AppiumDriver) driver; } } - public void driverSetupForApplitoolsInitializer(AppiumDriver aDriver) { - appiumDriver = aDriver; - } - public com.applitools.eyes.selenium.Eyes getWebEyes() { return this.eyesOnWeb; } @@ -174,4 +170,4 @@ private void handleFunctionalTestResults(String methodName, TestResults testResu "because visual validation failed", methodName))); } } -} +} \ No newline at end of file From 6b17819136760b69f6ac4d0f6dc7e63848aaf754 Mon Sep 17 00:00:00 2001 From: Megha Pradeep Date: Thu, 12 Oct 2023 14:06:38 +0530 Subject: [PATCH 3/3] passing webdriver to initialisevisualwebtest method --- .../znsio/applitools/integration/ApplitoolsInitializer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java b/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java index 5b6a7ec..87b0d03 100644 --- a/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java +++ b/src/main/java/com/znsio/applitools/integration/ApplitoolsInitializer.java @@ -60,7 +60,7 @@ public void setUpApplitoolsInitializer(XmlTest suite) throws IOException, Runtim } } - public void initiateApplitoolsInitializer(Method method) { + public void initiateApplitoolsInitializer(Method method, WebDriver webDriver) { LOGGER.info("@BeforeMethod of ApplitoolsInitializer called: " + method.getName()); if (isPlatformWeb() && isUltraFastGridEnabled()) { runner = new VisualGridRunner(new RunnerOptions().testConcurrency(getConcurrency())); @@ -69,7 +69,7 @@ public void initiateApplitoolsInitializer(Method method) { } runner.setDontCloseBatches(true); if (isPlatformWeb()) { - initiateVisualWebTests(method); + initiateVisualWebTests(method, webDriver); } else { initiateVisualAppTests(method); } @@ -105,7 +105,7 @@ public void closeBatch() { batch.setCompleted(true); } - private void initiateVisualWebTests(Method method) { + private void initiateVisualWebTests(Method method, WebDriver webDriver) { eyesOnWeb = new com.applitools.eyes.selenium.Eyes(runner); if (isLogsEnabled()) { eyesOnWeb.setLogHandler(new StdoutLogHandler(isLogsEnabled()));