Merge pull request #44 from ing-bank/feature/no-browser

Feature/no browser
ing-bank · Dec 23, 2024 · 91ee479 · 91ee479
2 parents 8ed8469 + 1abc3dc
commit 91ee479
Show file tree

Hide file tree

Showing 76 changed files with 1,429 additions and 1,353 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
@@ -25,4 +25,4 @@ jobs:
         uses: actions/[email protected]
         with:
           name: INGenious framework
-          path: Dist/target/*.zip
+          path: Dist/target/*.zip
diff --git a/Engine/pom.xml b/Engine/pom.xml
@@ -217,12 +217,6 @@
             <version>${appium.version}</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.13.1</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>com.galenframework</groupId>
             <artifactId>galen-core</artifactId>

diff --git a/Engine/src/main/java/com/ing/engine/commands/browser/Command.java b/Engine/src/main/java/com/ing/engine/commands/browser/Command.java
@@ -4,7 +4,7 @@
 import com.ing.datalib.or.image.ImageORObject;
 import com.ing.engine.core.CommandControl;
 import com.ing.engine.drivers.AutomationObject;
-import com.ing.engine.drivers.PlaywrightDriver;
+import com.ing.engine.drivers.PlaywrightDriverCreation;
 import com.ing.engine.execution.data.UserDataAccess;
 import com.ing.engine.reporting.TestCaseReport;
 import com.microsoft.playwright.APIRequestContext;
@@ -13,17 +13,15 @@
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.Page;
 import com.microsoft.playwright.Playwright;
-import javax.net.ssl.HttpsURLConnection;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
 
 //Added for Mobile
-import com.ing.engine.drivers.MobileDriver;
+import com.ing.engine.drivers.WebDriverCreation;
 import com.ing.engine.drivers.MobileObject;
-import io.appium.java_client.android.AndroidDriver;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 public class Command {
@@ -32,7 +30,7 @@ public class Command {
     public Playwright Playwright;
     public BrowserContext BrowserContext;
     public AutomationObject AObject;
-    public PlaywrightDriver Driver;
+    public PlaywrightDriverCreation Driver;
     public String Data;
     public String ObjectName;
     public Locator Locator;
@@ -86,9 +84,9 @@ public class Command {
      */
     public Command(CommandControl cc) {
         Commander = cc;
-        if(Commander.mobileDriver!=null)
+        if(Commander.webDriver!=null)
         {
-        mDriver = Commander.mobileDriver.driver;
+        mDriver = Commander.webDriver.driver;
         mObject = Commander.MObject;
         Data = Commander.Data;
         ObjectName = Commander.ObjectName;
@@ -179,13 +177,13 @@ public void executeMethod(Locator Locator, String Action) {
         executeMethod(Action);
     }
 
-    public PlaywrightDriver getDriverControl() {
+    public PlaywrightDriverCreation getDriverControl() {
         return Commander.Page;
     }
 
-    public MobileDriver getMobileDriverControl()
+    public WebDriverCreation getMobileDriverControl()
     {
-        return Commander.mobileDriver;
+        return Commander.webDriver;
     }
 
     public Boolean isDriverAlive() {

diff --git a/Engine/src/main/java/com/ing/engine/core/CommandControl.java b/Engine/src/main/java/com/ing/engine/core/CommandControl.java
@@ -6,7 +6,7 @@
 import com.ing.datalib.settings.DriverSettings;
 import com.ing.engine.drivers.AutomationObject;
 import com.ing.engine.drivers.AutomationObject.FindType;
-import com.ing.engine.drivers.PlaywrightDriver;
+import com.ing.engine.drivers.PlaywrightDriverCreation;
 import com.ing.engine.execution.data.DataProcessor;
 import com.ing.engine.execution.data.UserDataAccess;
 import com.ing.engine.execution.exception.UnCaughtException;
@@ -20,17 +20,16 @@
 import java.util.Stack;
 
 //Added For Mobile
-import com.ing.engine.drivers.MobileDriver;
+import com.ing.engine.drivers.WebDriverCreation;
 import com.ing.engine.drivers.MobileObject;
-import static com.ing.engine.reporting.reportportal.ReportPortalClient.runContext;
 import com.ing.engine.drivers.MobileObject.FindmType;
 import org.openqa.selenium.WebElement;
 
 public abstract class CommandControl {
 
-    public PlaywrightDriver Playwright;
-    public PlaywrightDriver Page;
-    public PlaywrightDriver BrowserContext;
+    public PlaywrightDriverCreation Playwright;
+    public PlaywrightDriverCreation Page;
+    public PlaywrightDriverCreation BrowserContext;
     public AutomationObject AObject;
     public String Data;
     public String Action;
@@ -49,27 +48,27 @@ public abstract class CommandControl {
     private Stack<Locator> runTimeElement = new Stack<>();
 
     public MobileObject MObject;
-    public MobileDriver mobileDriver;
+    public WebDriverCreation webDriver;
     public WebElement Element;
 
-    public CommandControl(PlaywrightDriver playwright, PlaywrightDriver page, PlaywrightDriver browserContext ,MobileDriver driver,TestCaseReport report) {
+    public CommandControl(PlaywrightDriverCreation playwright, PlaywrightDriverCreation page, PlaywrightDriverCreation browserContext ,WebDriverCreation driver,TestCaseReport report) {
         Playwright = playwright;
         BrowserContext = browserContext;
         Page = page;
-        mobileDriver=driver;
+        webDriver = driver;
         userData = new UserDataAccess() {
             @Override
             public TestCaseRunner context() {
                 return (TestCaseRunner) CommandControl.this.context();
             }
         };
-        if(mobileDriver==null)
+        if(webDriver==null)
         {
            AObject = new AutomationObject(Page.page); 
         }
-        else if(mobileDriver!=null)
+        else if(webDriver!=null)
         {
-           MObject=new MobileObject(mobileDriver.driver); 
+           MObject=new MobileObject(webDriver.driver); 
         }
         Report = (TestCaseReport) report;
 
@@ -82,7 +81,7 @@ public void refresh() {
     }
 
     public void sync(Step curr) throws UnCaughtException {
-        if(mobileDriver==null)
+        if(webDriver==null)
         {
         refresh();
         //AObject.setDriver(seDriver.driver);
@@ -153,11 +152,11 @@ public void sync(Step curr) throws UnCaughtException {
     }
 
     private Boolean canIFindElement() {
-        if(mobileDriver!=null)
+        if(webDriver!=null)
         {
-        if(mobileDriver.isAlive())
+        if(webDriver.isAlive())
         {
-            if (mobileDriver.getCurrentBrowser().equalsIgnoreCase("ProtractorJS")) {
+            if (webDriver.getCurrentBrowser().equalsIgnoreCase("ProtractorJS")) {
                 return false;
             } else {
                 switch (Action) {

diff --git a/Engine/src/main/java/com/ing/engine/core/Control.java b/Engine/src/main/java/com/ing/engine/core/Control.java
@@ -6,7 +6,7 @@
 
 import com.ing.engine.constants.FilePath;
 import com.ing.engine.constants.SystemDefaults;
-import com.ing.engine.drivers.PlaywrightDriver;
+import com.ing.engine.drivers.PlaywrightDriverCreation;
 import com.ing.engine.execution.exception.UnCaughtException;
 import com.ing.engine.execution.run.ProjectRunner;
 
@@ -17,17 +17,14 @@
 import com.ing.engine.support.methodInf.MethodInfoManager;
 import com.ing.engine.support.reflect.MethodExecutor;
 import com.ing.util.encryption.Encryption;
-import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-//Added for Mobile
-import com.ing.engine.drivers.MobileDriver;
-import com.ing.engine.drivers.MobileWebDriverFactory;
+import com.ing.engine.drivers.WebDriverCreation;
+import com.ing.engine.drivers.WebDriverFactory;
 
 public class Control {
 
@@ -42,9 +39,9 @@ public class Control {
     public static ProjectRunner exe;
     public static String triggerId;
 
-    private static PlaywrightDriver playwrightDriver;
+    private static PlaywrightDriverCreation playwrightDriver;
 
-    private static MobileDriver mobileDriver;
+    private static WebDriverCreation webDriver;
 
     private static void start() {
         do {
@@ -107,13 +104,9 @@ private void initRun() throws Exception {
         MethodExecutor.init();
         ConsoleReport.init();
         SystemDefaults.printSystemInfo();
-        System.out.println("Run Started on " + new Date().toString());
-        System.out.println("Loading Browser Profile");
-        // WebDriverFactory.initDriverLocation(exe.getProject().getProjectSettings());
-        MobileWebDriverFactory.initDriverLocation(exe.getProject().getProjectSettings());
-        System.out.println("Loading RunManager");
+        System.out.println("👉 Run Started on " + new Date().toString()+"\n");
+        WebDriverFactory.initDriverLocation(exe.getProject().getProjectSettings());
         RunManager.loadRunManager();
-        System.out.println("Initializing Report");
         ReportManager = new SummaryReport();
         triggerId = UUID.randomUUID().toString().replace("-", "").toUpperCase().substring(0, 15);
     }
@@ -127,8 +120,8 @@ private void startRun() {
                     exe.getExecSettings().getRunSettings().getThreadCount(),
                     exe.getExecSettings().getRunSettings().getExecutionTimeOut(),
                     exe.getExecSettings().getRunSettings().isGridExecution());
-            System.out.println("Run Manager " + !RunManager.queue().isEmpty());
-            System.out.println("Continue Execution " + !SystemDefaults.stopExecution.get());
+            System.out.println("\n👉 Run Manager : " + !RunManager.queue().isEmpty()+"\n");
+            System.out.println("👉 Continue Execution : " + !SystemDefaults.stopExecution.get()+"\n");
             while (!RunManager.queue().isEmpty() && !SystemDefaults.stopExecution.get()) {
                 Task t = null;
                 try {
@@ -173,20 +166,20 @@ private void startRun() {
         }
     }
 
-    static PlaywrightDriver getPlaywrightDriver() {
+    static PlaywrightDriverCreation getPlaywrightDriver() {
         return playwrightDriver;
     }
 
-    static MobileDriver getMobileDriver() {
-        return mobileDriver;
+    static WebDriverCreation getWebDriver() {
+        return webDriver;
     }
 
-    static void setSeDriver(PlaywrightDriver Driver) {
+    static void setPlaywrightDriver(PlaywrightDriverCreation Driver) {
         playwrightDriver = Driver;
     }
 
-    static void setMobileDriver(MobileDriver Driver) {
-        mobileDriver = Driver;
+    static void setWebDriver(WebDriverCreation Driver) {
+        webDriver = Driver;
     }
 
     private void endExecution() {
@@ -205,9 +198,9 @@ private void endExecution() {
                 playwrightDriver.closeBrowser();
                 playwrightDriver.playwright.close();
             } 
-           else if(mobileDriver != null)
+           else if(webDriver != null)
             {
-                mobileDriver.driver.quit();
+                webDriver.driver.quit();
             }
 
         } catch (Exception ex) {

diff --git a/Engine/src/main/java/com/ing/engine/core/RunContext.java b/Engine/src/main/java/com/ing/engine/core/RunContext.java
@@ -1,7 +1,7 @@
 
 package com.ing.engine.core;
 
-import com.ing.engine.drivers.WebDriverFactory.Browser;
+import com.ing.engine.drivers.PlaywrightDriverFactory.Browser;
 
 public class RunContext {
 

diff --git a/Engine/src/main/java/com/ing/engine/core/RunManager.java b/Engine/src/main/java/com/ing/engine/core/RunManager.java
@@ -5,7 +5,7 @@
 import com.ing.datalib.component.TestSet;
 import com.ing.engine.cli.LookUp;
 import com.ing.engine.constants.FilePath;
-import com.ing.engine.drivers.WebDriverFactory.Browser;
+import com.ing.engine.drivers.PlaywrightDriverFactory.Browser;
 import com.ing.engine.settings.GlobalSettings;
 import com.ing.datalib.model.Tags;
 import org.apache.commons.lang.ArrayUtils;