init commit

Author: Craig Mc Carthy

.github/workflows/run.yml

@@ -1,33 +1,105 @@
-name: Playwright Automated Testing Framework
+name: run
 
 on:
   pull_request:
     branches: [ "main" ]
   push:
     branches: [ "**" ]
 
+# Concurrency control to cancel previous runs on new commits
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+    
+    strategy:
+      matrix:
+        java: [17]
+        os: [ubuntu-latest, ubuntu-22.04]
+        browser: [chrome]
+      fail-fast: false
 
-    runs-on: ubuntu-latest
+    env:
+      DISPLAY: ':99'
+      MAVEN_OPTS: '-Xmx2048m'
+      BROWSER: ${{ matrix.browser }}
 
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/[email protected]
+      
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/[email protected]
         with:
-          java-version: '17'
+          java-version: '${{ matrix.java }}'
           distribution: 'temurin'
           cache: maven
-      - name: Remove Chrome
-        run: sudo apt purge google-chrome-stable
-      - name: Remove default Chromium
-        run: sudo apt purge chromium-browser
-
-      - name: Install Google Chrome # Using shell script to install Google Chrome
+          
+      - name: Cache Maven dependencies
+        uses: actions/[email protected]
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.m2/wrapper
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up Chrome
+        if: matrix.browser == 'chrome'
+        uses: browser-actions/[email protected]
+        with:
+          chrome-version: stable
+          
+      - name: Start Xvfb
         run: |
-          chmod +x ./.github/scripts/InstallChrome.sh
-          ./.github/scripts/InstallChrome.sh
+          sudo Xvfb :99 -ac -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          sleep 3
+          
+      - name: Validate environment
+        run: |
+          echo "Java version:"
+          java -version
+          echo "Maven version:"
+          mvn -version
+          echo "Browser: ${{ matrix.browser }}"
+          if [ "${{ matrix.browser }}" = "chrome" ]; then
+            echo "Chrome version:"
+            google-chrome --version
+          fi
+          echo "Display: $DISPLAY"
 
       - name: Test
-        run: mvn clean test -Ptest
+        run: mvn clean install -P headless-github -B -T 1C -Dbrowser=${{ matrix.browser }}
+        continue-on-error: false
+        timeout-minutes: 20
+        
+      - name: Upload test reports
+        uses: actions/[email protected]
+        if: always()
+        with:
+          name: test-reports-java${{ matrix.java }}-${{ matrix.os }}-${{ matrix.browser }}
+          path: |
+            **/target/surefire-reports/
+            **/target/allure-results/
+            **/target/cucumber/
+            **/logs/
+          retention-days: 30
+          
+      - name: Upload screenshots on failure
+        uses: actions/[email protected]
+        if: failure()
+        with:
+          name: screenshots-java${{ matrix.java }}-${{ matrix.os }}-${{ matrix.browser }}
+          path: |
+            **/target/screenshots/
+            **/target/test-output/
+          retention-days: 7
+          
+      - name: Cleanup
+        if: always()
+        run: |
+          pkill -f Xvfb || true
+          pkill -f chrome || true

common/src/main/java/com/cmccarthyirl/common/ExtentTests.java

@@ -1,7 +1,6 @@
 package com.cmccarthyirl.common;
 
 import com.aventstack.extentreports.ExtentTest;
-import com.aventstack.extentreports.Status;
 import com.aventstack.extentreports.model.Test;
 import org.testng.ITestResult;
 
@@ -134,16 +133,4 @@ private static void assignGroups(ExtentTest test, String[] groups) {
             });
         }
     }
-
-    // Map TestNG status code to ExtentReports status (PASS, FAIL, SKIP)
-    private static Status mapStatus(int statusCode) {
-        switch (statusCode) {
-            case ITestResult.FAILURE:
-                return Status.FAIL;
-            case ITestResult.SUCCESS:
-                return Status.PASS;
-            default:
-                return Status.SKIP;
-        }
-    }
 }