Slim down test dependencies

Author: AB-xdev

chartjs-java-model/pom.xml

@@ -139,6 +139,19 @@
 			<artifactId>testcontainers</artifactId>
 			<version>${testcontainers-version}</version>
 			<scope>test</scope>
+			<exclusions>
+				<!-- No JUnit 4 -->
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>software.xdev</groupId>
+			<artifactId>testcontainers-junit4-mock</artifactId>
+			<version>1.0.1</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
@@ -147,9 +160,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>selenium</artifactId>
-			<version>${testcontainers-version}</version>
+			<groupId>software.xdev</groupId>
+			<artifactId>testcontainers-selenium</artifactId>
+			<version>1.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -159,6 +172,13 @@
 			<artifactId>selenium-chrome-driver</artifactId>
 			<version>4.20.0</version>
 			<scope>test</scope>
+			<exclusions>
+				<!-- Tracing is not needed -->
+				<exclusion>
+					<groupId>io.opentelemetry</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 

chartjs-java-model/src/test/java/software/xdev/chartjs/model/AbstractChartTest.java

@@ -26,11 +26,11 @@
 import org.openqa.selenium.OutputType;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.slf4j.bridge.SLF4JBridgeHandler;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 import org.testcontainers.utility.MountableFile;
 
 import software.xdev.chartjs.model.charts.Chart;
-import software.xdev.chartjs.model.container.SimpleBrowserWebDriverContainer;
+import software.xdev.chartjs.model.container.SeleniumBrowserWebDriverContainer;
+import software.xdev.testcontainers.selenium.containers.browser.BrowserWebDriverContainer;
 
 
 public abstract class AbstractChartTest
@@ -43,36 +43,34 @@ public abstract class AbstractChartTest
 	protected static final String CONTAINER_TEST_TEMPLATE_HTML_FILE = "/home/user/" + TEST_TEMPLATE_HTML_FILE;
 
 	// One Container is started once and only the rendered HTML is changed. Improves performance.
-	protected static final SimpleBrowserWebDriverContainer WEB_CONTAINER = createBrowserWithTempDirectoryMounted();
+	protected static final SeleniumBrowserWebDriverContainer WEB_CONTAINER = createBrowserWithTempDirectoryMounted();
 
-	private static SimpleBrowserWebDriverContainer createBrowserWithTempDirectoryMounted()
+	private static SeleniumBrowserWebDriverContainer createBrowserWithTempDirectoryMounted()
 	{
 		if(!SLF4JBridgeHandler.isInstalled())
 		{
 			SLF4JBridgeHandler.removeHandlersForRootLogger();
 			SLF4JBridgeHandler.install();
 		}
 
-		final SimpleBrowserWebDriverContainer browserContainer = new SimpleBrowserWebDriverContainer()
-			.withRecordingMode(
-				BrowserWebDriverContainer.VncRecordingMode.SKIP,
-				null)
-			.withCapabilities(new ChromeOptions())
-			.withCopyFileToContainer(
-				MountableFile.forClasspathResource("/" + TEST_TEMPLATE_HTML_FILE),
-				CONTAINER_TEST_TEMPLATE_HTML_FILE);
+		final SeleniumBrowserWebDriverContainer browserContainer =
+			new SeleniumBrowserWebDriverContainer(new ChromeOptions())
+				.withRecordingMode(BrowserWebDriverContainer.RecordingMode.SKIP)
+				.withCopyFileToContainer(
+					MountableFile.forClasspathResource("/" + TEST_TEMPLATE_HTML_FILE),
+					CONTAINER_TEST_TEMPLATE_HTML_FILE);
 		browserContainer.start();
 		return browserContainer;
 	}
 
-	protected SimpleBrowserWebDriverContainer getWebContainer()
+	protected SeleniumBrowserWebDriverContainer getWebContainer()
 	{
 		return WEB_CONTAINER;
 	}
 
 	protected void createScreenshotAndCompare(
 		final Chart<?, ?, ?> chart,
-		final SimpleBrowserWebDriverContainer browserContainer,
+		final SeleniumBrowserWebDriverContainer browserContainer,
 		final String screenshotReference)
 	{
 		try
@@ -93,7 +91,7 @@ protected void createScreenshotAndCompare(
 	}
 
 	protected void assertCurrentBrowserViewEqualsScreenshot(
-		final SimpleBrowserWebDriverContainer browserContainer,
+		final SeleniumBrowserWebDriverContainer browserContainer,
 		final String screenshotReference) throws IOException
 	{
 		final byte[] actual = browserContainer.webDriver().getScreenshotAs(OutputType.BYTES);

chartjs-java-model/src/test/java/software/xdev/chartjs/model/container/SimpleBrowserWebDriverContainer.java renamed to chartjs-java-model/src/test/java/software/xdev/chartjs/model/container/SeleniumBrowserWebDriverContainer.java

@@ -21,20 +21,20 @@
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.rnorth.ducttape.timeouts.Timeouts;
 import org.rnorth.ducttape.unreliables.Unreliables;
-import org.testcontainers.containers.BrowserWebDriverContainer;
 
+import software.xdev.testcontainers.selenium.containers.browser.CapabilitiesBrowserWebDriverContainer;
 
-public class SimpleBrowserWebDriverContainer extends BrowserWebDriverContainer<SimpleBrowserWebDriverContainer>
+
+public class SeleniumBrowserWebDriverContainer
+	extends CapabilitiesBrowserWebDriverContainer<SeleniumBrowserWebDriverContainer>
 {
 	protected RemoteWebDriver webDriver;
-	
 	protected Capabilities capabilities;
 
-	@Override
-	public SimpleBrowserWebDriverContainer withCapabilities(final Capabilities capabilities)
+	public SeleniumBrowserWebDriverContainer(final Capabilities capabilities)
 	{
+		super(capabilities);
 		this.capabilities = capabilities;
-		return super.withCapabilities(capabilities);
 	}
 
 	public synchronized RemoteWebDriver webDriver()
@@ -46,7 +46,7 @@ public synchronized RemoteWebDriver webDriver()
 				() -> Timeouts.getWithTimeout(
 					20,
 					TimeUnit.SECONDS,
-					() -> new RemoteWebDriver(this.getSeleniumAddress(), this.capabilities)
+					() -> new RemoteWebDriver(this.getSeleniumAddressURI().toURL(), this.capabilities, false)
 				)
 			);
 		}