Fixed close browser and update screen

Author: anhtester

README.md

@@ -1,7 +1,7 @@
 ![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-# PlaywrightJava
+# Playwright Java
 Learning Playwright for Java | Anh Tester
 
 Project nghiên cứu Playwright với ngôn ngữ lập trình Java cùng TestNG Framework theo mô hình code Page Object Model.

pom.xml

@@ -26,23 +26,23 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>7.6.1</version>
+            <version>7.4.0</version>
             <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4</version>
             <scope>test</scope>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.4</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/anhtester/com/manager/BrowserFactory.java

@@ -12,8 +12,8 @@ public class BrowserFactory {
     protected static Page page;
 
     private static Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-    private static int screenWidth = (int) screenSize.getWidth();
-    private static int screenHeight = (int) screenSize.getHeight();
+    private static int screenWidth = ((int) screenSize.getWidth()) - 350;
+    private static int screenHeight = ((int) screenSize.getHeight()) - 320;
 
     //https://playwright.dev/java/docs/browsers
 
@@ -50,11 +50,11 @@ public static Page createBrowser(String browserName) {
 
         PageManager.setBrowser(browser);
         browserContext = PageManager.getBrowser().newContext(new Browser.NewContextOptions().setViewportSize(screenWidth, screenHeight));
+        //browserContext = PageManager.getBrowser().newContext();
         PageManager.setBrowserContext(browserContext);
         page = PageManager.getBrowserContext().newPage();
         PageManager.setPage(page);
-        ActionKeyword.maximizeBrowserOnWindow();
-
+        //ActionKeyword.maximizeBrowserOnWindow();
         return PageManager.getPage();
     }
 }

src/main/java/anhtester/com/manager/PageManager.java

@@ -47,15 +47,19 @@ public static void setPage(Page page) {
 
     public static void closePage() {
         if (pageThreadLocal.get() != null) {
+            pageThreadLocal.get().close();
             pageThreadLocal.remove();
         }
     }
 
     public static void closeBrowser() {
         if (browserThreadLocal.get() != null) {
+            browserThreadLocal.get().close();
             browserThreadLocal.remove();
+            System.out.println("Closed browser.");
         }
         if (playwrightThreadLocal.get() != null) {
+            playwrightThreadLocal.get().close();
             playwrightThreadLocal.remove();
         }
     }

src/test/java/anhtester/com/common/BaseTest.java

@@ -14,17 +14,14 @@ public class BaseTest {
 
     @BeforeMethod
     @Parameters({"browser"})
-    public void createBrowser(@Optional("chromium") String browserName) {
+    public void createBrowser(@Optional("chrome") String browserName) {
         BrowserFactory.createBrowser(browserName);
     }
 
     @AfterMethod
     public void closePage() {
         PageManager.closePage();
-    }
-
-    @AfterSuite
-    public void closeBrowser() {
         PageManager.closeBrowser();
     }
+
 }

src/test/java/anhtester/com/listener/TestListener.java

@@ -0,0 +1,5 @@
+package anhtester.com.listener;
+
+public class TestListener {
+
+}

src/test/java/anhtester/com/pom/pages/CommonPage.java

@@ -13,6 +13,7 @@ public CommonPage(Page _page){
     }
 
     public CategoryPage openCategoryPage(){
+        page.waitForLoadState();
         page.click(menuProducts);
         page.click(menuCategory);
         return new CategoryPage(page);