From 3534b1b5fa88c17b84940d7963a6ee422b0f55ef Mon Sep 17 00:00:00 2001
From: Charankumar H <charankumarh@Charankumars-MacBook-Pro.local>
Date: Sun, 22 Jun 2025 19:00:43 +0530
Subject: [PATCH] Refactored the listeners back to test package.

---
 .../portal/qa/commons/WebBasePage.java        | 36 -------------------
 .../listeners/WebAnnotationTransformer.java   |  0
 .../portal/qa/listeners/WebTestListeners.java |  0
 3 files changed, 36 deletions(-)
 rename src/{main => test}/java/io/swaglabs/portal/qa/listeners/WebAnnotationTransformer.java (100%)
 rename src/{main => test}/java/io/swaglabs/portal/qa/listeners/WebTestListeners.java (100%)

diff --git a/src/main/java/io/swaglabs/portal/qa/commons/WebBasePage.java b/src/main/java/io/swaglabs/portal/qa/commons/WebBasePage.java
index 910ebbf..d13b862 100644
--- a/src/main/java/io/swaglabs/portal/qa/commons/WebBasePage.java
+++ b/src/main/java/io/swaglabs/portal/qa/commons/WebBasePage.java
@@ -4,15 +4,11 @@
 import com.microsoft.playwright.Page;
 import io.swaglabs.portal.qa.constants.WebPortalConstants;
 import io.swaglabs.portal.qa.exceptions.WebPageException;
-import io.swaglabs.portal.qa.listeners.WebTestListeners;
 import io.swaglabs.portal.qa.locators.Locators;
 import io.swaglabs.portal.qa.screenshotsmanager.ElementScreenshotStrategy;
 import io.swaglabs.portal.qa.screenshotsmanager.ScreenshotContext;
-import org.testng.ITestResult;
-import org.testng.Reporter;
 
 import java.util.Objects;
-import java.util.function.Consumer;
 
 public abstract class WebBasePage {
 
@@ -62,36 +58,4 @@ protected void takeElementScreenshot(Locator locator, String fileName) {
         ScreenshotContext screenshotContext = new ScreenshotContext(new ElementScreenshotStrategy(locator));
         screenshotContext.captureScreenshot(basePage, ELEMENT_SCREENSHOT_FILE_LOCATION + fileName + WebPortalConstants.IMAGE_FORMAT);
     }
-    
-    protected void switchToNewTabAndRun(Page newTabPage, Consumer<WebBasePage> actionsInNewTab) {
-        Page originalPage = this.basePage;
-        Locators originalLocators = this.locators;
-        try {
-            // Update to new tab context
-            this.basePage = newTabPage;
-            this.locators = new Locators(newTabPage);
-            WebTestListeners.setPage(newTabPage);
-            actionsInNewTab.accept(this); // Perform operations in new tab
-        } catch (Exception testException) {
-            // Capture screenshot of the new tab before any cleanup
-            if (newTabPage != null && !newTabPage.isClosed()) {
-                ITestResult currentTestResult = Reporter.getCurrentTestResult();
-                if (currentTestResult != null) {
-                    currentTestResult.setStatus(ITestResult.FAILURE);
-                    currentTestResult.setThrowable(testException);
-                    WebTestListeners listeners = new WebTestListeners();
-                    listeners.onTestFailure(currentTestResult);
-                }
-            }
-            throw testException; // Re-throw to maintain original behavior
-        } finally {
-            if (newTabPage != null && !newTabPage.isClosed()) {
-                newTabPage.close(); // Always close the new tab
-            }
-            WebTestListeners.setPage(originalPage);
-            // Revert to the original page and locator
-            this.basePage = originalPage;
-            this.locators = originalLocators;
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/io/swaglabs/portal/qa/listeners/WebAnnotationTransformer.java b/src/test/java/io/swaglabs/portal/qa/listeners/WebAnnotationTransformer.java
similarity index 100%
rename from src/main/java/io/swaglabs/portal/qa/listeners/WebAnnotationTransformer.java
rename to src/test/java/io/swaglabs/portal/qa/listeners/WebAnnotationTransformer.java
diff --git a/src/main/java/io/swaglabs/portal/qa/listeners/WebTestListeners.java b/src/test/java/io/swaglabs/portal/qa/listeners/WebTestListeners.java
similarity index 100%
rename from src/main/java/io/swaglabs/portal/qa/listeners/WebTestListeners.java
rename to src/test/java/io/swaglabs/portal/qa/listeners/WebTestListeners.java