Added resource cleanups for Browser Management.

Author: iamcharankumar

src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserFactory.java

@@ -2,14 +2,22 @@
 
 import io.swaglabs.portal.qa.constants.WebPortalConstants;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class BrowserFactory {
 
+    ThreadLocal<Map<String, IBrowser>> BROWWSER_CACHE = ThreadLocal.withInitial(HashMap::new);
+
     public IBrowser createBrowser() {
-        return switch (BrowserName.fromConfigValue(WebPortalConstants.BROWSER)) {
-            case CHROME -> new ChromeBrowser();
-            case EDGE -> new EdgeBrowser();
-            case FIREFOX -> new FirefoxBrowser();
-            case WEBKIT -> new WebkitBrowser();
-        };
+        String browserName = WebPortalConstants.BROWSER;
+        return BROWWSER_CACHE.get().computeIfAbsent(browserName, name ->
+                switch (BrowserName.fromConfigValue(browserName)) {
+                    case CHROME -> new ChromeBrowser();
+                    case EDGE -> new EdgeBrowser();
+                    case FIREFOX -> new FirefoxBrowser();
+                    case WEBKIT -> new WebkitBrowser();
+
+                });
     }
 }

src/main/java/io/swaglabs/portal/qa/browsermanager/BrowserManager.java

@@ -1,26 +1,58 @@
 package io.swaglabs.portal.qa.browsermanager;
 
+import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserContext;
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Playwright;
 import io.swaglabs.portal.qa.constants.WebPortalConstants;
+import io.swaglabs.portal.qa.exceptions.WebUtilsException;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.Objects;
 
+@Slf4j
 public class BrowserManager implements IBrowserManager<Page> {
 
+    private static final ThreadLocal<BrowserContext> BROWSER_CONTEXT = new ThreadLocal<>();
+    private static final ThreadLocal<Browser> BROWSER = new ThreadLocal<>();
+
     @Override
     public Page getBrowserPage(Playwright playwright) {
-        Objects.requireNonNull(playwright, "Playwright instance is null in Browser Manager!");
-        boolean isHeadless = "headless".equals(WebPortalConstants.RUN_MODE);
-        BrowserContext browserContext = new BrowserFactory().createBrowser().createSession(playwright, isHeadless);
-        Objects.requireNonNull(browserContext, "Playwright Browser Context is null!");
-        return browserContext.newPage();
+        try {
+            Objects.requireNonNull(playwright, "Playwright instance is null in Browser Manager!");
+            boolean isHeadless = "headless".equals(WebPortalConstants.RUN_MODE);
+            BrowserContext browserContext = new BrowserFactory().createBrowser().createSession(playwright, isHeadless);
+            BROWSER_CONTEXT.set(browserContext);
+            if (browserContext.browser() != null)
+                BROWSER.set(browserContext.browser());
+            return browserContext.newPage();
+        } catch (Exception e) {
+            log.error("Browser initialization failed.");
+            cleanUp();
+            throw new WebUtilsException("Failed to create browser page: " + e);
+        }
     }
 
     @Override
     public void destroyBrowserPage(Page page) {
-        Objects.requireNonNull(page, "Playwright Browser is null!");
-        page.close();
+        try {
+            if (page != null)
+                page.close();
+        } finally {
+            cleanUp();
+        }
+    }
+
+    private void cleanUp() {
+        BrowserContext browserContext = BROWSER_CONTEXT.get();
+        if (browserContext != null) {
+            browserContext.close();
+            BROWSER_CONTEXT.remove();
+        }
+        Browser browser = BROWSER.get();
+        if (browser != null) {
+            browser.close();
+            BROWSER.remove();
+        }
     }
 }

src/test/java/io/swaglabs/portal/qa/testcases/SwagLabsTestBase.java

@@ -16,17 +16,37 @@ public sealed class SwagLabsTestBase extends WebBaseTest permits SwagLabsE2ETest
 
     @BeforeMethod(alwaysRun = true)
     public void setUpSwagLabsPortal(Method method) {
-        log.info("Thread id in BeforeMethod for the test method : {} is {}.", method.getName(), Thread.currentThread().getId());
-        SWAG_LABS_PORTAL.set(new SwagLabsPortal(page.get()));
-        SWAG_LABS_PORTAL.get().visit();
-        boolean isLoggedIn = SWAG_LABS_PORTAL.get().LOGIN_PAGE.isLoginSuccess();
-        if (!isLoggedIn)
-            throw new WebPageException("Swags Labs Portal Not Logged In!");
+        final long threadId = Thread.currentThread().getId();
+        log.info("Thread {} starting method {}", threadId, method.getName());
+        try {
+            // 1. Initialize portal (thread-safe via ThreadLocal)
+            SWAG_LABS_PORTAL.set(new SwagLabsPortal(page.get()));
+            // 2. Visit and login
+            SWAG_LABS_PORTAL.get().visit();
+            boolean isLoggedIn = SWAG_LABS_PORTAL.get().LOGIN_PAGE.isLoginSuccess();
+            if (!isLoggedIn)
+                throw new WebPageException("Swags Labs Portal Not Logged In!");
+        } catch (Exception e) {
+            log.error("Initialization failed for thread {}", threadId, e);
+            cleanUpResources();
+            throw e;
+        }
     }
 
     @AfterMethod(alwaysRun = true)
     public void tearDownSwagLabsPortal(Method method) {
-        log.info("Thread id in AfterMethod for the test method :{} is {}.", method.getName(), Thread.currentThread().getId());
+        final long threadId = Thread.currentThread().getId();
+        log.info("Thread {} finishing method {}", threadId, method.getName());
         SWAG_LABS_PORTAL.remove();
     }
+
+    private void cleanUpResources() {
+        try {
+            if (SWAG_LABS_PORTAL.get() != null)
+                // Simple cleanup - just remove the ThreadLocal
+                SWAG_LABS_PORTAL.remove();
+        } catch (Exception e) {
+            log.error("Thread {} cleanup error", Thread.currentThread().getId(), e);
+        }
+    }
 }