Merge pull request #2 from abhishek-lambda/dev

Add support for all capabilities of selenium 3 & 4

Author: abhishek-lambda

.github/workflows/pre-prod-release.yml

@@ -0,0 +1,41 @@
+name: Pre-Prod Release
+
+on:
+  push:
+    branches:
+      - pre-prod
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: maven
+      
+      - name: Build with Maven
+        run: mvn clean package
+      
+      - name: Upload main JAR artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: lambdatest-java-selenium-sdk
+          path: target/lambdatest-java-selenium-sdk-*.jar
+          retention-days: 90
+          if-no-files-found: error
+      
+      - name: Upload agent JAR artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: lambdatest-java-selenium-sdk-agent
+          path: target/lambdatest-java-selenium-sdk-*-agent.jar
+          retention-days: 90
+          if-no-files-found: error
+

.gitignore

@@ -24,4 +24,5 @@ MAVEN_CENTRAL*
 *.tmp
 *.bak
 *~
-gradle.properties
+gradle.properties
+.gradle/

.gradle/8.10/fileHashes/fileHashes.bin

@@ -4,7 +4,7 @@
   <groupId>com.lambdatest</groupId>
   <artifactId>lambdatest-java-selenium-sdk</artifactId>
   <name>LambdaTest Selenium SDK</name>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
   <description>A Java SDK for integrating Selenium tests with LambdaTest cloud platform</description>
   <url>https://www.lambdatest.com</url>
   <licenses>

.gradle/8.10/fileHashes/fileHashes.lock

@@ -6,7 +6,7 @@
 
     <groupId>com.lambdatest</groupId>
     <artifactId>lambdatest-java-selenium-sdk</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
 
     <name>LambdaTest Selenium SDK</name>

dependency-reduced-pom.xml

@@ -0,0 +1,67 @@
+package com.lambdatest.selenium.lambdatest.capabilities;
+
+import java.util.Map;
+
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+/**
+ * Handles browser-specific options (Chrome, Firefox, Edge, Safari, Opera, IE).
+ * These need special handling because they have different keys for Selenium 3 and 4.
+ */
+public class BrowserOptionsCapabilities {
+
+    /**
+     * Process browser-specific options from config.
+     * Sets both Selenium 3 and Selenium 4 keys for compatibility.
+     */
+    public static void processBrowserOptions(Map<String, Object> config, DesiredCapabilities capabilities) {
+        // Chrome
+        processBrowserOption(config, capabilities, "chromeOptions", "goog:chromeOptions");
+
+        // Firefox
+        processBrowserOption(config, capabilities, "firefoxOptions", "moz:firefoxOptions");
+
+        // Edge
+        processBrowserOption(config, capabilities, "edgeOptions", "ms:edgeOptions");
+
+        // Safari
+        processBrowserOption(config, capabilities, "safariOptions", "safari:options");
+
+        // Opera (no W3C namespace, same for both)
+        processBrowserOption(config, capabilities, "operaOptions", "operaOptions");
+
+        // Internet Explorer
+        processBrowserOption(config, capabilities, "ieOptions", "se:ieOptions", "IEOptions");
+    }
+
+    /**
+     * Process a browser option with Selenium 3 and 4 compatibility.
+     */
+    private static void processBrowserOption(Map<String, Object> config, DesiredCapabilities capabilities,
+                                           String selenium3Key, String selenium4Key) {
+        processBrowserOption(config, capabilities, selenium3Key, selenium4Key, selenium3Key);
+    }
+
+    /**
+     * Process a browser option with custom Selenium 3 key.
+     */
+    private static void processBrowserOption(Map<String, Object> config, DesiredCapabilities capabilities,
+                                           String selenium3Key, String selenium4Key, String selenium3TargetKey) {
+        Object options = null;
+
+        // Check Selenium 3 key first
+        if (config.containsKey(selenium3Key)) {
+            options = config.get(selenium3Key);
+        } 
+        // Then check Selenium 4 key
+        else if (config.containsKey(selenium4Key)) {
+            options = config.get(selenium4Key);
+        }
+
+        if (options != null) {
+            // Set both keys for compatibility
+            capabilities.setCapability(selenium3TargetKey, options); // Selenium 3
+            capabilities.setCapability(selenium4Key, options);      // Selenium 4 W3C
+        }
+    }
+}

pom.xml

@@ -0,0 +1,86 @@
+package com.lambdatest.selenium.lambdatest.capabilities;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Definition of a capability with its key, aliases, and target locations.
+ * This makes it easy to add new capabilities without modifying the main processing logic.
+ */
+public class CapabilityDefinition {
+    
+    private final String primaryKey;
+    private final List<String> aliases;
+    private final CapabilityTarget target;
+    private final String targetKey; // Optional: different key in target (e.g., "project" -> "projectName" for Selenium 3)
+    
+    /**
+     * Where the capability should be set.
+     */
+    public enum CapabilityTarget {
+        /** Set directly on DesiredCapabilities (Selenium 3 style) */
+        DESIRED_CAPABILITIES,
+        /** Set in lt:options (Selenium 4/W3C style) */
+        LT_OPTIONS,
+        /** Set in both places (for backwards compatibility) */
+        BOTH
+    }
+    
+    public CapabilityDefinition(String primaryKey, CapabilityTarget target) {
+        this(primaryKey, target, null);
+    }
+    
+    public CapabilityDefinition(String primaryKey, CapabilityTarget target, String targetKey) {
+        this(primaryKey, Arrays.asList(), target, targetKey);
+    }
+    
+    public CapabilityDefinition(String primaryKey, List<String> aliases, CapabilityTarget target) {
+        this(primaryKey, aliases, target, null);
+    }
+    
+    public CapabilityDefinition(String primaryKey, List<String> aliases, CapabilityTarget target, String targetKey) {
+        this.primaryKey = primaryKey;
+        this.aliases = aliases;
+        this.target = target;
+        this.targetKey = targetKey;
+    }
+    
+    public String getPrimaryKey() {
+        return primaryKey;
+    }
+    
+    public List<String> getAliases() {
+        return aliases;
+    }
+    
+    public CapabilityTarget getTarget() {
+        return target;
+    }
+    
+    public String getTargetKey() {
+        return targetKey != null ? targetKey : primaryKey;
+    }
+    
+    /**
+     * Check if this definition matches the given key (primary key or any alias).
+     */
+    public boolean matches(String key) {
+        return primaryKey.equals(key) || aliases.contains(key);
+    }
+    
+    /**
+     * Get the value from config if it exists (checking primary key and aliases).
+     */
+    public Object getValue(java.util.Map<String, Object> config) {
+        if (config.containsKey(primaryKey)) {
+            return config.get(primaryKey);
+        }
+        for (String alias : aliases) {
+            if (config.containsKey(alias)) {
+                return config.get(alias);
+            }
+        }
+        return null;
+    }
+}
+