From 511baa0ce2ce29387d5222e83fe965cbbefe10d2 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Mon, 8 Jul 2024 10:44:39 -0400
Subject: [PATCH 01/27] HPCC-31857 : Added new step to run ecl watch UI tests,
 updated step to upload test logs to artifact, updated step to upload ecl
 watch test files to artifact.

---
 .github/workflows/build-docker.yml      |  6 ++---
 .github/workflows/test-ui-gh_runner.yml | 29 ++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 7c5090750b6..de49ac7b34f 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -176,13 +176,13 @@ jobs:
             ${{ github.workspace }}/HPCC-Platform/.github/workflows/timeoutcmd
           if-no-files-found: error
 
-      - name: Upload UI Test Files
+      - name: Upload ECL Watch UI Test Files
         if: ${{ inputs.upload-package == true }}
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ inputs.asset-name }}-ui_test-files
+          name: ${{ inputs.asset-name }}-ecl_watch_ui_tests
           path: |
-            ${{ github.workspace }}/HPCC-Platform/esp/src/test-ui/**/*
+            ${{ github.workspace }}/HPCC-Platform/esp/src/test-ui/tests/framework/**/*
           if-no-files-found: error
 
       - name: Upload Error Logs
diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 902b02f678b..e2105eccdb9 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -142,8 +142,13 @@ jobs:
           sudo chown root:root /usr/bin/chromedriver
           sudo chmod +x /usr/bin/chromedriver
           wget https://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
-          wget http://www.java2s.com/Code/JarDownload/testng/testng-6.8.7.jar.zip
-          unzip testng-6.8.7.jar.zip
+          wget https://repo1.maven.org/maven2/org/testng/testng/7.7.1/testng-7.7.1.jar
+          wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.0/jackson-annotations-2.17.0.jar
+          wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.0/jackson-core-2.17.0.jar
+          wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.jar
+          wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
+          wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.17.0/selenium-server-4.17.0.jar
+          java -jar selenium-server-4.17.0.jar standalone
 
       - name: Run Tests
         timeout-minutes: 10 # generous, current runtime is ~1min, this should be increased if new tests are added
@@ -158,12 +163,26 @@ jobs:
           [[ $retCode -ne 0 ]] && exit 1
           popd
 
-      - name: eclwatch-ui-test-logs-artifact
+      - name: Run ECL Watch UI Tests
+        timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
+        if: steps.check.outputs.runtests
+        shell: "bash"
+        run: |
+          export CLASSPATH=".:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
+          pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
+          find ${{ inputs.asset-name }}-ecl_watch_ui_tests -iname '*.java' -type f -exec javac {} \;
+          java TestRunner detail
+          echo "ECL Watch UI test done"
+          lines=$(wc -l < error_ecl_test.log)
+          [[ $lines -ne 0 ]] && exit 1
+          popd
+
+      - name: Upload ECL Watch UI Test Logs To Artifact
         if: ${{ failure() || cancelled() }}
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ inputs.asset-name }}-ui_test-logs
+          name: ${{ inputs.asset-name }}-ecl_watch_ui_tests
           path: |
-            ${{ inputs.asset-name }}-ui_test-files/eclWatchUiTest.log
+            ${{ inputs.asset-name }}-ecl_watch_ui_tests/*.log
             /home/runner/HPCCSystems-regression/log/*.json
           if-no-files-found: error

From c5510668990e4e09b492aed5dd0c435c0bb42e24 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 09:34:28 -0400
Subject: [PATCH 02/27] HPCC-31857 : Added the directory framework and file
 TestRunner to test the yml changes.

---
 .../test-ui/tests/framework/TestRunner.java   | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 esp/src/test-ui/tests/framework/TestRunner.java

diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
new file mode 100644
index 00000000000..c96e703f7b6
--- /dev/null
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -0,0 +1,53 @@
+package framework;
+
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.openqa.selenium.remote.RemoteWebDriver;
+
+import java.io.IOException;
+
+public class TestRunner {
+
+    public static void main(String[] args) throws IOException, InterruptedException {
+        System.setProperty("webdriver.chrome.silentOutput", "true");
+        System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver");
+        // java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF);
+
+        ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.addArguments("--headless");
+        chromeOptions.addArguments("--no-sandbox");
+        chromeOptions.addArguments("--log-level=3");
+
+        WebDriver driver = new ChromeDriver(chromeOptions);
+
+        Capabilities caps = ((RemoteWebDriver) driver).getCapabilities();
+
+        String browserName = caps.getBrowserName();
+        //String browserVersion = caps.getVersion();
+        // System.out.println(browserName+" "+browserVersion);
+
+        driver.get("http://127.0.0.1:8010/");
+
+        Thread.sleep(1000);
+
+        if (driver.getPageSource().contains("Job Name")) {
+                System.out.println("Pass");
+        } else {
+                System.err.println("Fail");
+        }
+        if (driver.getPageSource().contains("Owner")) {
+                System.out.println("Pass");
+        } else {
+                System.err.println("Fail");
+        }
+        if (driver.getPageSource().contains("Target/Wuid")) {
+                System.out.println("Pass");
+        } else {
+                System.err.println("Fail");
+        }
+
+        driver.quit();
+    }
+}

From 520e07587a0b96da355967e6b7ca5d5c67bb9470 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 10:36:23 -0400
Subject: [PATCH 03/27] HPCC-31857 : Updated folder name ecl_watch_ui_tests
 with the older one.

---
 .github/workflows/test-ui-gh_runner.yml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index e2105eccdb9..539d68612ad 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -33,17 +33,17 @@ jobs:
       - name: Download UI Test Files
         uses: actions/download-artifact@v3
         with:
-          name: ${{ inputs.asset-name }}-ui_test-files
-          path: ${{ inputs.asset-name }}-ui_test-files
+          name: ${{ inputs.asset-name }}-ecl_watch_ui_tests
+          path: ${{ inputs.asset-name }}-ecl_watch_ui_tests
 
       - name: Check ECLWatch UI Test Directory
         id: check
         run: |
-          if [[ ! -d ${{ inputs.asset-name }}-ui_test-files ]]
+          if [[ ! -d ${{ inputs.asset-name }}-ecl_watch_ui_tests ]]
           then
-              echo "ECLWatch UI ${{ inputs.asset-name }}-ui_test-files directory missing."
+              echo "ECLWatch UI ${{ inputs.asset-name }}-ecl_watch_ui_tests directory missing."
           else
-              javaFilesCount=$(find ${{ inputs.asset-name }}-ui_test-files/ -iname '*.java' -type f -print | wc -l )
+              javaFilesCount=$(find ${{ inputs.asset-name }}-ecl_watch_ui_tests/ -iname '*.java' -type f -print | wc -l )
               echo "Number of test java files is $javaFilesCount"
               if [[ ${javaFilesCount} -eq 0 ]]
               then
@@ -95,7 +95,7 @@ jobs:
           chmod +x ./${{ inputs.asset-name }}-support-files/*
           sudo cp ./${{ inputs.asset-name }}-support-files/* /opt/HPCCSystems/bin
 
-          chmod +x ./${{ inputs.asset-name }}-ui_test-files/*
+          chmod +x ./${{ inputs.asset-name }}-ecl_watch_ui_tests/*
 
       - name: Start HPCC-Platform
         shell: "bash"
@@ -150,19 +150,6 @@ jobs:
           wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.17.0/selenium-server-4.17.0.jar
           java -jar selenium-server-4.17.0.jar standalone
 
-      - name: Run Tests
-        timeout-minutes: 10 # generous, current runtime is ~1min, this should be increased if new tests are added
-        if: steps.check.outputs.runtests
-        shell: "bash"
-        run: |
-          export CLASSPATH=".:${{ github.workspace }}/selenium-server-standalone-3.141.59.jar:${{ github.workspace }}/testng-6.8.7.jar"
-          pushd ${{ inputs.asset-name }}-ui_test-files
-          ./run.sh tests http://localhost:8010 > eclWatchUiTest.log 2>&1
-          retCode=$?
-          echo "UI test done"
-          [[ $retCode -ne 0 ]] && exit 1
-          popd
-
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
         if: steps.check.outputs.runtests

From 4dae5883dbb605ffcae5e48ecf10cef0e59b4118 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 11:08:07 -0400
Subject: [PATCH 04/27] HPCC-31857 : Updated yml to fix selenium server run

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 539d68612ad..bf2a68928ae 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -148,7 +148,7 @@ jobs:
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
           wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.17.0/selenium-server-4.17.0.jar
-          java -jar selenium-server-4.17.0.jar standalone
+          java -jar selenium-server-4.17.0.jar standalone &
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added

From ff2b674cf691e43eb323f8b5ee18c4fd90a14c57 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 11:47:50 -0400
Subject: [PATCH 05/27] HPCC-31857 : updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index bf2a68928ae..6292e6ce952 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -157,7 +157,7 @@ jobs:
         run: |
           export CLASSPATH=".:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
-          find ${{ inputs.asset-name }}-ecl_watch_ui_tests -iname '*.java' -type f -exec javac {} \;
+          find -iname '*.java' -type f -exec javac {} \;
           java TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)

From e73d05b597544f052f45d66c469ab3f540d30a1e Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 11:53:26 -0400
Subject: [PATCH 06/27] HPCC-31857 : updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 6292e6ce952..e0a17df3b2d 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -157,7 +157,7 @@ jobs:
         run: |
           export CLASSPATH=".:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
-          find -iname '*.java' -type f -exec javac {} \;
+          find . -iname '*.java' -type f -exec javac {} \;
           java TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)

From d94ff4d100d08f2202b369e4634a23411d1efee1 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 12:30:58 -0400
Subject: [PATCH 07/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index e0a17df3b2d..d61b07ef0a7 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -155,7 +155,7 @@ jobs:
         if: steps.check.outputs.runtests
         shell: "bash"
         run: |
-          export CLASSPATH=".:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
+          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           find . -iname '*.java' -type f -exec javac {} \;
           java TestRunner detail

From 24afc30793b61ca0e9dc06efacbc820700f18f8a Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 12:58:35 -0400
Subject: [PATCH 08/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index d61b07ef0a7..5fb5fee13b5 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -158,7 +158,7 @@ jobs:
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           find . -iname '*.java' -type f -exec javac {} \;
-          java TestRunner detail
+          cd framework java TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)
           [[ $lines -ne 0 ]] && exit 1

From fbe4f83adf1bc1f017487df86cd839acb7a4f7b1 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 13:00:57 -0400
Subject: [PATCH 09/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 5fb5fee13b5..fe7c5bd7459 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -158,7 +158,8 @@ jobs:
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           find . -iname '*.java' -type f -exec javac {} \;
-          cd framework java TestRunner detail
+          cd framework 
+          java TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)
           [[ $lines -ne 0 ]] && exit 1

From 5b7931c402713b94e0caee3763a8880d8a6ecd03 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 14:15:59 -0400
Subject: [PATCH 10/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index fe7c5bd7459..894a9ad1b51 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -157,7 +157,9 @@ jobs:
         run: |
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
-          find . -iname '*.java' -type f -exec javac {} \;
+          find . -iname '*.java' -type f -print -exec javac {} \;
+          ls -l
+          find . -iname '*.*a*' -type f -exec ls -l {} \;
           cd framework 
           java TestRunner detail
           echo "ECL Watch UI test done"

From 95567f0ca4ccbe6e99a1ee7ecb301471f1bb27ce Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 14:56:57 -0400
Subject: [PATCH 11/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 894a9ad1b51..22d4e2ff557 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -160,8 +160,7 @@ jobs:
           find . -iname '*.java' -type f -print -exec javac {} \;
           ls -l
           find . -iname '*.*a*' -type f -exec ls -l {} \;
-          cd framework 
-          java TestRunner detail
+          java ./TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)
           [[ $lines -ne 0 ]] && exit 1

From 45f09419ffe9622165403356985e73cff1979573 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 16:01:31 -0400
Subject: [PATCH 12/27] HPCC-31857 : Updated yml

---
 esp/src/test-ui/tests/framework/TestRunner.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
index c96e703f7b6..4539fd90ed4 100644
--- a/esp/src/test-ui/tests/framework/TestRunner.java
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -1,4 +1,3 @@
-package framework;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;

From 08356cf74dd05906a2b53d56cf5f261d48e1958d Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 16:31:24 -0400
Subject: [PATCH 13/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml         | 4 +---
 esp/src/test-ui/tests/framework/TestRunner.java | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 22d4e2ff557..d9a2ed1f5cb 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -158,9 +158,7 @@ jobs:
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           find . -iname '*.java' -type f -print -exec javac {} \;
-          ls -l
-          find . -iname '*.*a*' -type f -exec ls -l {} \;
-          java ./TestRunner detail
+          java framework.TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)
           [[ $lines -ne 0 ]] && exit 1
diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
index 4539fd90ed4..c96e703f7b6 100644
--- a/esp/src/test-ui/tests/framework/TestRunner.java
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -1,3 +1,4 @@
+package framework;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;

From 1aee8b23f39389d13a8bad639a07af1a6916ccc2 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 16:35:58 -0400
Subject: [PATCH 14/27] HPCC-31857 : Updated yml

---
 .github/workflows/build-docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index de49ac7b34f..f4c97ebc7a2 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -182,7 +182,7 @@ jobs:
         with:
           name: ${{ inputs.asset-name }}-ecl_watch_ui_tests
           path: |
-            ${{ github.workspace }}/HPCC-Platform/esp/src/test-ui/tests/framework/**/*
+            ${{ github.workspace }}/HPCC-Platform/esp/src/test-ui/tests/**/*
           if-no-files-found: error
 
       - name: Upload Error Logs

From be12186c01a76389a4d42f9b2d7664d4563dcdaf Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 16:52:02 -0400
Subject: [PATCH 15/27] HPCC-31857 : Updated yml

---
 esp/src/test-ui/tests/Activities.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esp/src/test-ui/tests/Activities.java b/esp/src/test-ui/tests/Activities.java
index d160ae8f60c..35686098d3e 100644
--- a/esp/src/test-ui/tests/Activities.java
+++ b/esp/src/test-ui/tests/Activities.java
@@ -24,7 +24,7 @@ public static void main(String[] args) throws IOException, InterruptedException
         Capabilities caps = ((RemoteWebDriver) driver).getCapabilities();
 
         String browserName = caps.getBrowserName();
-        String browserVersion = caps.getVersion();
+        //String browserVersion = caps.getVersion();
         // System.out.println(browserName+" "+browserVersion);
 
         driver.get(args[0]);

From 4987f9496a91c19c3820354a24277c22ee1f51c1 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Wed, 10 Jul 2024 17:14:35 -0400
Subject: [PATCH 16/27] HPCC-31857 : Updated yml

---
 esp/src/test-ui/tests/framework/TestRunner.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
index c96e703f7b6..92983e1c0d2 100644
--- a/esp/src/test-ui/tests/framework/TestRunner.java
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -7,6 +7,7 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 import java.io.IOException;
+import java.net.URI;
 
 public class TestRunner {
 
@@ -20,7 +21,7 @@ public static void main(String[] args) throws IOException, InterruptedException
         chromeOptions.addArguments("--no-sandbox");
         chromeOptions.addArguments("--log-level=3");
 
-        WebDriver driver = new ChromeDriver(chromeOptions);
+        WebDriver driver = new RemoteWebDriver(URI.create("http://localhost:4444/wd/hub").toURL(), chromeOptions);
 
         Capabilities caps = ((RemoteWebDriver) driver).getCapabilities();
 

From e792f8c1b962128d049852cd14bca53d80cc5d97 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Thu, 11 Jul 2024 09:10:05 -0400
Subject: [PATCH 17/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index d9a2ed1f5cb..b98cfe52837 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -148,7 +148,7 @@ jobs:
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
           wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.17.0/selenium-server-4.17.0.jar
-          java -jar selenium-server-4.17.0.jar standalone &
+          #java -jar selenium-server-4.17.0.jar standalone &
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added

From 7fd5f0e1e39e8578f2e0c3f23e8f656a23b080c1 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Thu, 11 Jul 2024 09:53:19 -0400
Subject: [PATCH 18/27] HPCC-31857 : Updated yml

---
 .github/workflows/test-ui-gh_runner.yml       |  5 +-
 .../test-ui/tests/framework/TestRunner.java   | 69 ++++++++++++-------
 2 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index b98cfe52837..057d1003345 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -148,7 +148,10 @@ jobs:
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
           wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.17.0/selenium-server-4.17.0.jar
-          #java -jar selenium-server-4.17.0.jar standalone &
+          java -jar selenium-server-4.17.0.jar standalone &
+          ps aux
+          sudo apt-get install -y net-tools
+          sudo netstat -tulnap
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
index 92983e1c0d2..b3a1feaf0d9 100644
--- a/esp/src/test-ui/tests/framework/TestRunner.java
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -2,16 +2,14 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-import java.io.IOException;
 import java.net.URI;
 
 public class TestRunner {
 
-    public static void main(String[] args) throws IOException, InterruptedException {
+    public static void main(String[] args) {
         System.setProperty("webdriver.chrome.silentOutput", "true");
         System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver");
         // java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF);
@@ -21,34 +19,53 @@ public static void main(String[] args) throws IOException, InterruptedException
         chromeOptions.addArguments("--no-sandbox");
         chromeOptions.addArguments("--log-level=3");
 
-        WebDriver driver = new RemoteWebDriver(URI.create("http://localhost:4444/wd/hub").toURL(), chromeOptions);
+        WebDriver driver = null;
 
-        Capabilities caps = ((RemoteWebDriver) driver).getCapabilities();
+        try {
 
-        String browserName = caps.getBrowserName();
-        //String browserVersion = caps.getVersion();
-        // System.out.println(browserName+" "+browserVersion);
+            driver = new RemoteWebDriver(URI.create("http://localhost:4444/wd/hub").toURL(), chromeOptions);
 
-        driver.get("http://127.0.0.1:8010/");
+            Capabilities caps = ((RemoteWebDriver) driver).getCapabilities();
 
-        Thread.sleep(1000);
-
-        if (driver.getPageSource().contains("Job Name")) {
-                System.out.println("Pass");
-        } else {
-                System.err.println("Fail");
-        }
-        if (driver.getPageSource().contains("Owner")) {
-                System.out.println("Pass");
-        } else {
-                System.err.println("Fail");
-        }
-        if (driver.getPageSource().contains("Target/Wuid")) {
-                System.out.println("Pass");
-        } else {
-                System.err.println("Fail");
+            String browserName = caps.getBrowserName();
+            System.out.println("browserName: " + browserName);
+            //String browserVersion = caps.getVersion();
+            // System.out.println(browserName+" "+browserVersion);
+        } catch (Exception ex) {
+            System.out.println("Exception in driver initialization: " + ex.getMessage());
         }
 
-        driver.quit();
+        try {
+
+            if (driver != null) {
+                driver.get("http://127.0.0.1:8010/");
+
+                Thread.sleep(1000);
+
+                if (driver.getPageSource().contains("Job Name")) {
+                    System.out.println("Pass");
+                } else {
+                    System.err.println("Fail");
+                }
+                if (driver.getPageSource().contains("Owner")) {
+                    System.out.println("Pass");
+                } else {
+                    System.err.println("Fail");
+                }
+                if (driver.getPageSource().contains("Target/Wuid")) {
+                    System.out.println("Pass");
+                } else {
+                    System.err.println("Fail");
+                }
+
+                driver.quit();
+
+            }else{
+                System.out.println("Error: Driver did not initialize");
+            }
+
+        } catch (Exception ex) {
+            System.out.println("Exception in loading web page: " + ex.getMessage());
+        }
     }
 }

From 06582c20d84bd50e9ca5058f02e0c37f829d4281 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Thu, 11 Jul 2024 16:11:26 -0400
Subject: [PATCH 19/27] HPCC-31857

---
 .github/workflows/test-ui-gh_runner.yml         | 8 ++------
 esp/src/test-ui/tests/framework/TestRunner.java | 7 +++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 057d1003345..308abbe38e2 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -141,17 +141,13 @@ jobs:
           sudo mv chromedriver /usr/bin/chromedriver
           sudo chown root:root /usr/bin/chromedriver
           sudo chmod +x /usr/bin/chromedriver
-          wget https://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
           wget https://repo1.maven.org/maven2/org/testng/testng/7.7.1/testng-7.7.1.jar
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.0/jackson-annotations-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.0/jackson-core-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
-          wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.17.0/selenium-server-4.17.0.jar
-          java -jar selenium-server-4.17.0.jar standalone &
-          ps aux
-          sudo apt-get install -y net-tools
-          sudo netstat -tulnap
+          wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.22.0/selenium-java-4.22.0.zip
+          unzip selenium-java-4.22.0.zip
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
index b3a1feaf0d9..3710ce8b33a 100644
--- a/esp/src/test-ui/tests/framework/TestRunner.java
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -2,6 +2,7 @@
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
@@ -11,7 +12,8 @@ public class TestRunner {
 
     public static void main(String[] args) {
         System.setProperty("webdriver.chrome.silentOutput", "true");
-        System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver");
+        System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver/chromedriver.exe");
+        //System.setProperty("webdriver.chrome.driver", "C:/Users/nisha/Documents/Internship/Work/jars/chromeDriver/chromedriver.exe");
         // java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF);
 
         ChromeOptions chromeOptions = new ChromeOptions();
@@ -23,7 +25,7 @@ public static void main(String[] args) {
 
         try {
 
-            driver = new RemoteWebDriver(URI.create("http://localhost:4444/wd/hub").toURL(), chromeOptions);
+            driver = new ChromeDriver(chromeOptions);
 
             Capabilities caps = ((RemoteWebDriver) driver).getCapabilities();
 
@@ -39,6 +41,7 @@ public static void main(String[] args) {
 
             if (driver != null) {
                 driver.get("http://127.0.0.1:8010/");
+                //driver.get("https://play.hpccsystems.com:18010/esp/files/index.html#/activities");
 
                 Thread.sleep(1000);
 

From 941b314d8d2abbeaf592b83bc9418789c83d148c Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Thu, 11 Jul 2024 16:35:50 -0400
Subject: [PATCH 20/27] HPCC-31857

---
 .github/workflows/test-ui-gh_runner.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 308abbe38e2..cfd48ee9173 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -154,7 +154,7 @@ jobs:
         if: steps.check.outputs.runtests
         shell: "bash"
         run: |
-          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-server-4.17.0.jar:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
+          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-java-4.22.0/*:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           find . -iname '*.java' -type f -print -exec javac {} \;
           java framework.TestRunner detail

From 657ff6a0f0c8e1b1ca492989fc8d9c47198be666 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Thu, 11 Jul 2024 16:57:59 -0400
Subject: [PATCH 21/27] HPCC-31857 - Modified code to as per updated selenium
 jar

---
 .github/workflows/test-ui-gh_runner.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index cfd48ee9173..0a59bcbff46 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -154,7 +154,11 @@ jobs:
         if: steps.check.outputs.runtests
         shell: "bash"
         run: |
-          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-java-4.22.0/*:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
+          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
+          # Add all unzipped JAR files to the CLASSPATH
+          for jar in selenium-java-4.22.0/*.jar; do
+            export CLASSPATH="$CLASSPATH:${{ github.workspace }}/$jar"
+          done
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           find . -iname '*.java' -type f -print -exec javac {} \;
           java framework.TestRunner detail

From fb017c2133d876d05cb361d3ee25af518fc5b1f5 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Fri, 12 Jul 2024 09:05:53 -0400
Subject: [PATCH 22/27] HPCC-31857 - Changes

---
 .github/workflows/test-ui-gh_runner.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 0a59bcbff46..e5eead51c79 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -148,6 +148,7 @@ jobs:
           wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
           wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.22.0/selenium-java-4.22.0.zip
           unzip selenium-java-4.22.0.zip
+          ls -l
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
@@ -156,11 +157,16 @@ jobs:
         run: |
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
           # Add all unzipped JAR files to the CLASSPATH
+          pwd
           for jar in selenium-java-4.22.0/*.jar; do
-            export CLASSPATH="$CLASSPATH:${{ github.workspace }}/$jar"
+            echo "jar: $jar"
+            CLASSPATH="$CLASSPATH:${{ github.workspace }}/$jar"
           done
+          echo "CLASSPATH: $CLASSPATH"
+          export CLASSPATH
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
-          find . -iname '*.java' -type f -print -exec javac {} \;
+          pwd
+          find . -iname '*.java' -type f -print -exec javac --verbose {} \;
           java framework.TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)

From 9203913cb694739795e268a261aa5f603d35f951 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Fri, 12 Jul 2024 09:36:17 -0400
Subject: [PATCH 23/27] HPCC-31857 - Changes

---
 .github/workflows/test-ui-gh_runner.yml         | 17 ++++++-----------
 esp/src/test-ui/tests/framework/TestRunner.java |  4 +---
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index e5eead51c79..a45a0262423 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -147,26 +147,21 @@ jobs:
           wget https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.0/jackson-databind-2.17.0.jar
           wget https://repo1.maven.org/maven2/com/beust/jcommander/1.82/jcommander-1.82.jar
           wget https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.22.0/selenium-java-4.22.0.zip
-          unzip selenium-java-4.22.0.zip
-          ls -l
+          wget https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar
+          wget https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar
+          unzip selenium-java-4.22.0.zip -d selenium-libs
+          ls -l selenium-libs
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
         if: steps.check.outputs.runtests
         shell: "bash"
         run: |
-          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar"
-          # Add all unzipped JAR files to the CLASSPATH
-          pwd
-          for jar in selenium-java-4.22.0/*.jar; do
-            echo "jar: $jar"
-            CLASSPATH="$CLASSPATH:${{ github.workspace }}/$jar"
-          done
+          export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-libs/*:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar:${{ github.workspace }}/slf4j-api-1.7.30.jar:${{ github.workspace }}/slf4j-simple-1.7.30.jar"
           echo "CLASSPATH: $CLASSPATH"
-          export CLASSPATH
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           pwd
-          find . -iname '*.java' -type f -print -exec javac --verbose {} \;
+          find . -iname '*.java' -type f -print -exec javac {} \;
           java framework.TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)
diff --git a/esp/src/test-ui/tests/framework/TestRunner.java b/esp/src/test-ui/tests/framework/TestRunner.java
index 3710ce8b33a..7f8a10a606e 100644
--- a/esp/src/test-ui/tests/framework/TestRunner.java
+++ b/esp/src/test-ui/tests/framework/TestRunner.java
@@ -6,13 +6,11 @@
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
-import java.net.URI;
-
 public class TestRunner {
 
     public static void main(String[] args) {
         System.setProperty("webdriver.chrome.silentOutput", "true");
-        System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver/chromedriver.exe");
+        System.setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver");
         //System.setProperty("webdriver.chrome.driver", "C:/Users/nisha/Documents/Internship/Work/jars/chromeDriver/chromedriver.exe");
         // java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF);
 

From cc62060a65c34256571fe9eb867408ffde19d02d Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Fri, 12 Jul 2024 10:03:02 -0400
Subject: [PATCH 24/27] HPCC-31857 - Changes

---
 .github/workflows/test-ui-gh_runner.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index a45a0262423..3e10c3bf390 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -150,7 +150,6 @@ jobs:
           wget https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar
           wget https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/1.7.30/slf4j-simple-1.7.30.jar
           unzip selenium-java-4.22.0.zip -d selenium-libs
-          ls -l selenium-libs
 
       - name: Run ECL Watch UI Tests
         timeout-minutes: 80 # generous, current runtime is ~38 minutes, this should be increased if new tests are added
@@ -158,10 +157,12 @@ jobs:
         shell: "bash"
         run: |
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-libs/*:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar:${{ github.workspace }}/slf4j-api-1.7.30.jar:${{ github.workspace }}/slf4j-simple-1.7.30.jar"
-          echo "CLASSPATH: $CLASSPATH"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
           pwd
           find . -iname '*.java' -type f -print -exec javac {} \;
+          ps aux
+          sudo apt-get install -y net-tools
+          sudo netstat -tulnap
           java framework.TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)

From efbf3df3c45747ba9909dce0a4bafe84d9d9b027 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Fri, 12 Jul 2024 10:29:07 -0400
Subject: [PATCH 25/27] HPCC-31857 - Changes

---
 .github/workflows/test-ui-gh_runner.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 3e10c3bf390..7fab0c28fd1 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -163,6 +163,7 @@ jobs:
           ps aux
           sudo apt-get install -y net-tools
           sudo netstat -tulnap
+          ip -4 addr
           java framework.TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)

From 10c6572697e905d87da12c99ffa68651af2b3e72 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Fri, 12 Jul 2024 13:12:09 -0400
Subject: [PATCH 26/27] HPCC-31857 - Changes

---
 .github/workflows/test-ui-gh_runner.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 7fab0c28fd1..865cd2d495e 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -136,9 +136,9 @@ jobs:
         run: |
           wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
           sudo apt-get install -y ./google-chrome-stable_current_amd64.deb
-          wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip
-          unzip chromedriver_linux64.zip
-          sudo mv chromedriver /usr/bin/chromedriver
+          wget https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.126/linux64/chromedriver-linux64.zip
+          unzip chromedriver-linux64.zip -d chromedriver
+          sudo mv chromedriver/chromedriver-linux64/chromedriver /usr/bin/chromedriver
           sudo chown root:root /usr/bin/chromedriver
           sudo chmod +x /usr/bin/chromedriver
           wget https://repo1.maven.org/maven2/org/testng/testng/7.7.1/testng-7.7.1.jar

From 7a719f125c82a17548d3d3f9fa6b648bd6e3b6e6 Mon Sep 17 00:00:00 2001
From: Nisha Bagdwal <nishabagdwal@gmail.com>
Date: Fri, 12 Jul 2024 13:30:15 -0400
Subject: [PATCH 27/27] HPCC-31857 - Changes

---
 .github/workflows/test-ui-gh_runner.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
index 865cd2d495e..bbdfe2d6acb 100644
--- a/.github/workflows/test-ui-gh_runner.yml
+++ b/.github/workflows/test-ui-gh_runner.yml
@@ -158,12 +158,7 @@ jobs:
         run: |
           export CLASSPATH=".:${{ inputs.asset-name }}-ecl_watch_ui_tests:${{ github.workspace }}/selenium-libs/*:${{ github.workspace }}/testng-7.7.1.jar:${{ github.workspace }}/jackson-annotations-2.17.0.jar:${{ github.workspace }}/jackson-core-2.17.0.jar:${{ github.workspace }}/jackson-databind-2.17.0.jar:${{ github.workspace }}/jcommander-1.82.jar:${{ github.workspace }}/slf4j-api-1.7.30.jar:${{ github.workspace }}/slf4j-simple-1.7.30.jar"
           pushd ${{ inputs.asset-name }}-ecl_watch_ui_tests
-          pwd
           find . -iname '*.java' -type f -print -exec javac {} \;
-          ps aux
-          sudo apt-get install -y net-tools
-          sudo netstat -tulnap
-          ip -4 addr
           java framework.TestRunner detail
           echo "ECL Watch UI test done"
           lines=$(wc -l < error_ecl_test.log)