Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions cb-kit-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.squareup.retrofit2/retrofit -->
<dependency>
<groupId>com.squareup.retrofit2</groupId>
Expand All @@ -78,27 +68,6 @@
<artifactId>converter-jackson</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>

<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
<version>2.2</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import io.cloudbeat.common.har.model.*;
import io.cloudbeat.common.model.HttpNetworkEntry;
import okio.Path;
import org.apache.cxf.helpers.FileUtils;

import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.OpenOption;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
Expand Down
6 changes: 0 additions & 6 deletions cb-kit-junit4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

<properties>
<junit.version>4.12</junit.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -28,11 +27,6 @@
<version>${revision}</version>
</dependency>
<!-- JUnit 4 -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,12 @@ public static void attachPageSource(final String pageSource, boolean addToStep)
}

private static String getVideoName(final TestInfo testInfo) {
if (testInfo.getTestMethod().isPresent()) {
return Math.abs(testInfo.getTestMethod().get().hashCode()) + "";
// getCapabilities() can be called with no TestInfo at all (e.g. from driver setup code
// that runs outside a test method's own parameter list, like DriverManager.getDriver())
if (testInfo == null || !testInfo.getTestMethod().isPresent()) {
return null;
}
return null;
return Math.abs(testInfo.getTestMethod().get().hashCode()) + "";
}

public static void attachScreenshot(final byte[] screenshotData) {
Expand Down
20 changes: 13 additions & 7 deletions cb-kit-selenium4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
<packaging>jar</packaging>

<properties>
<!-- Selenium and Appium versions -->
<!-- Selenium versions -->
<selenium.version>4.39.0</selenium.version>
<devtools.version>v143</devtools.version>
<appium.version>9.2.2</appium.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -62,11 +61,18 @@
<artifactId>selenium-devtools-${devtools.version}</artifactId>
<version>${selenium.version}</version>
</dependency>
<!-- Appium -->
<!-- used directly by the HAR-processing classes in io.cloudbeat.selenium.har - moved
here from cb-kit-common (which has no use for either) since that module was only
supplying them transitively via the otherwise-unused cxf-bundle-jaxrs bundle -->
<dependency>
<groupId>io.appium</groupId>
<artifactId>java-client</artifactId>
<version>${appium.version}</version>
</dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
</dependencies>
</project>