Skip to content

Commit

Permalink
fix(capabilities): update capabilities for testing cloud provider to …
Browse files Browse the repository at this point in the history 
…Selenium4 standard when generating automatically by Cerberus
  • Loading branch information
@lucashimpens
lucashimpens committed Dec 24, 2024
1 parent 44308a2 commit 43f7156
Showing 1 changed file with 31 additions and 35 deletions.
66 changes: 31 additions & 35 deletions source/src/main/java/org/cerberus/core/engine/execution/impl/RobotServerService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,11 @@
import io.appium.java_client.LocksDevice;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.ios.IOSDriver;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.LaxRedirectStrategy;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.util.EntityUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -65,26 +61,18 @@
import org.openqa.selenium.logging.LogType;
import org.openqa.selenium.logging.LoggingPreferences;
import org.openqa.selenium.remote.*;
import org.openqa.selenium.remote.http.HttpClient.Factory;
import org.openqa.selenium.safari.SafariOptions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.time.Duration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;

import org.apache.http.impl.client.CloseableHttpClient;
import org.cerberus.core.crud.entity.Application;
import org.cerberus.core.crud.entity.Invariant;
import org.cerberus.core.crud.entity.Parameter;
Expand Down Expand Up @@ -563,6 +551,10 @@ private String guessRobotProvider(String host) {
private MutableCapabilities setCapabilities(TestCaseExecution tCExecution) throws CerberusException {
// Instanciate DesiredCapabilities
MutableCapabilities caps = new MutableCapabilities();
Map<String, Object> cloudOptions = new HashMap<>(); //Selenium Capabilities when testing cloud provider is used
Map<String, Object> appiumOptions = new HashMap<>(); //Appium Capabilities
Map<String, Object> cloudAppiumOptions = new HashMap<>(); //Appium Capabilities when testing cloud provider is used

// In case browser is not defined at that level, we force it to firefox.
if (StringUtil.isEmptyOrNull(tCExecution.getBrowser())) {
tCExecution.setBrowser("");
Expand Down Expand Up @@ -646,7 +638,7 @@ private MutableCapabilities setCapabilities(TestCaseExecution tCExecution) throw
}
}

// if application is a mobile one, then set the "app" capability to theapplication binary path
// if application is a mobile one, then set the "app" capability to the application binary path
if (tCExecution.getApplicationObj().getType().equalsIgnoreCase(Application.TYPE_APK)
|| tCExecution.getApplicationObj().getType().equalsIgnoreCase(Application.TYPE_IPA)) {
// Set the app capability with the application path
Expand Down Expand Up @@ -674,64 +666,68 @@ && isNotAlreadyDefined(caps, "appWaitActivity"))) {
switch (tCExecution.getRobotProvider()) {
case TestCaseExecution.ROBOTPROVIDER_BROWSERSTACK:
if (!StringUtil.isEmptyOrNull(tCExecution.getTag()) && isNotAlreadyDefined(caps, "build")) {
caps.setCapability("build", tCExecution.getTag());
cloudOptions.put("build", tCExecution.getTag());
}

if (isNotAlreadyDefined(caps, "project")) {
caps.setCapability("project", tCExecution.getApplication());
cloudOptions.put("project", tCExecution.getApplication());
} else {
cloudOptions.put("project", caps.getCapability("project"));
}

if (isNotAlreadyDefined(caps, "name")) {
String externalExeName = parameterService.getParameterStringByKey("cerberus_browserstack_defaultexename", tCExecution.getSystem(), "Exe : %EXEID%");
externalExeName = externalExeName.replace("%EXEID%", String.valueOf(tCExecution.getId()));
externalExeName = externalExeName.replace("%TESTFOLDER%", String.valueOf(tCExecution.getTest()));
externalExeName = externalExeName.replace("%TESTID%", String.valueOf(tCExecution.getTestCase()));
externalExeName = externalExeName.replace("%TESTDESCRIPTION%", String.valueOf(tCExecution.getDescription()));
caps.setCapability("name", externalExeName);
cloudOptions.put("name", externalExeName);
}

if (tCExecution.getVerbose() >= 2) {
if (isNotAlreadyDefined(caps, "browserstack.debug")) {
caps.setCapability("browserstack.debug", true);
cloudOptions.put("browserstack.debug", true);
}
if (isNotAlreadyDefined(caps, "browserstack.console")) {
caps.setCapability("browserstack.console", "warnings");
cloudOptions.put("browserstack.console", "warnings");
}
if (isNotAlreadyDefined(caps, "browserstack.networkLogs")) {
caps.setCapability("browserstack.networkLogs", true);
cloudOptions.put("browserstack.networkLogs", true);
}
}

//Create or override these capabilities if proxy required.
if (StringUtil.parseBoolean(tCExecution.getRobotExecutorObj().getExecutorProxyType())) {
caps.setCapability("browserstack.local", true);
caps.setCapability("browserstack.user", tCExecution.getRobotExecutorObj().getHostUser());
caps.setCapability("browserstack.key", tCExecution.getRobotExecutorObj().getHostPassword());
caps.setCapability("browserstack.localIdentifier", tCExecution.getExecutionUUID());
cloudOptions.put("browserstack.local", true);
cloudOptions.put("browserstack.user", tCExecution.getRobotExecutorObj().getHostUser());
cloudOptions.put("browserstack.key", tCExecution.getRobotExecutorObj().getHostPassword());
cloudOptions.put("browserstack.localIdentifier", tCExecution.getExecutionUUID());
}

break;
case TestCaseExecution.ROBOTPROVIDER_LAMBDATEST:
if (!StringUtil.isEmptyOrNull(tCExecution.getTag()) && isNotAlreadyDefined(caps, "build")) {
caps.setCapability("build", tCExecution.getTag());
cloudOptions.put("build", tCExecution.getTag());
}
if (isNotAlreadyDefined(caps, "name")) {
String externalExeName = parameterService.getParameterStringByKey("cerberus_lambdatest_defaultexename", tCExecution.getSystem(), "Exe : %EXEID% - %TESTDESCRIPTION%");
externalExeName = externalExeName.replace("%EXEID%", String.valueOf(tCExecution.getId()));
externalExeName = externalExeName.replace("%TESTFOLDER%", String.valueOf(tCExecution.getTest()));
externalExeName = externalExeName.replace("%TESTID%", String.valueOf(tCExecution.getTestCase()));
externalExeName = externalExeName.replace("%TESTDESCRIPTION%", String.valueOf(tCExecution.getDescription()));
caps.setCapability("name", externalExeName);
cloudOptions.put("name", externalExeName);
}
if (tCExecution.getVerbose() >= 2) {
if (isNotAlreadyDefined(caps, "video")) {
caps.setCapability("video", true);
cloudOptions.put("video", true);
}
if (isNotAlreadyDefined(caps, "visual")) {
caps.setCapability("visual", true);
cloudOptions.put("visual", true);
}
if (isNotAlreadyDefined(caps, "network")) {
caps.setCapability("network", true);
cloudOptions.put("network", true);
}
if (isNotAlreadyDefined(caps, "console")) {
caps.setCapability("console", true);
cloudOptions.put("console", true);
}
}
break;
Expand All @@ -744,7 +740,7 @@ && isNotAlreadyDefined(caps, "appWaitActivity"))) {
externalExeName = externalExeName.replace("%TEST%", String.valueOf(tCExecution.getTest()));
externalExeName = externalExeName.replace("%TESTCASE%", String.valueOf(tCExecution.getTestCase()));
externalExeName = externalExeName.replace("%TESTCASEDESC%", String.valueOf(tCExecution.getTestCaseObj().getDescription()));
caps.setCapability("sessionName", externalExeName);
cloudOptions.put("sessionName", externalExeName);
}
if (isNotAlreadyDefined(caps, "sessionDescription")) {
String externalExeName = parameterService.getParameterStringByKey("cerberus_kobiton_defaultsessiondescription", tCExecution.getSystem(), "%TESTCASEDESC%");
Expand All @@ -754,18 +750,18 @@ && isNotAlreadyDefined(caps, "appWaitActivity"))) {
externalExeName = externalExeName.replace("%TEST%", String.valueOf(tCExecution.getTest()));
externalExeName = externalExeName.replace("%TESTCASE%", String.valueOf(tCExecution.getTestCase()));
externalExeName = externalExeName.replace("%TESTCASEDESC%", String.valueOf(tCExecution.getTestCaseObj().getDescription()));
caps.setCapability("sessionDescription", externalExeName);
cloudOptions.put("sessionDescription", externalExeName);
}

if (isNotAlreadyDefined(caps, "deviceGroup")) {
caps.setCapability("deviceGroup", "KOBITON"); // use UIAutomator2 by default
cloudOptions.put("deviceGroup", "KOBITON");
}
break;
case TestCaseExecution.ROBOTPROVIDER_NONE:
break;
default:
}

caps.setCapability("cloud:options", cloudOptions);
return caps;
}

Expand Down

0 comments on commit 43f7156

Please sign in to comment.