Skip to content

Commit c9049ae

Browse files
committed
Further cleanup
1 parent aeb092f commit c9049ae

File tree

5 files changed

+11
-37
lines changed

5 files changed

+11
-37
lines changed

modules/selenium/src/test/java/org/testcontainers/junit/BrowserWebDriverContainerTest.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ public class BrowserWebDriverContainerTest {
1919

2020
private static final String NO_PROXY_VALUE = "localhost,.noproxy-domain.com";
2121

22+
private static final String CHROME_IMAGE = "selenium/standalone-chrome:4.1.1";
23+
private static final String FIREFOX_IMAGE = "selenium/standalone-firefox:4.1.1";
24+
2225
@Test
2326
public void honorPresetNoProxyEnvironment() {
2427
try (
25-
BrowserWebDriverContainer chromeWithNoProxySet = (BrowserWebDriverContainer) new BrowserWebDriverContainer()
26-
.withCapabilities(new ChromeOptions())
28+
BrowserWebDriverContainer<?> chromeWithNoProxySet = new BrowserWebDriverContainer<>(CHROME_IMAGE)
2729
.withEnv(NO_PROXY_KEY, NO_PROXY_VALUE)
2830
) {
2931
chromeWithNoProxySet.start();
@@ -36,9 +38,7 @@ public void honorPresetNoProxyEnvironment() {
3638
@Test
3739
public void provideDefaultNoProxyEnvironmentIfNotSet() {
3840
try (
39-
BrowserWebDriverContainer chromeWithoutNoProxySet = new BrowserWebDriverContainer()
40-
.withCapabilities(new ChromeOptions())
41-
41+
BrowserWebDriverContainer<?> chromeWithoutNoProxySet = new BrowserWebDriverContainer<>(CHROME_IMAGE)
4242
) {
4343
chromeWithoutNoProxySet.start();
4444

@@ -51,8 +51,7 @@ public void provideDefaultNoProxyEnvironmentIfNotSet() {
5151
@Test
5252
public void createContainerWithShmVolume() {
5353
try (
54-
BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer()
55-
.withCapabilities(new FirefoxOptions())
54+
BrowserWebDriverContainer<?> webDriverContainer = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
5655
) {
5756
webDriverContainer.start();
5857

@@ -67,9 +66,8 @@ public void createContainerWithShmVolume() {
6766
@Test
6867
public void createContainerWithoutShmVolume() {
6968
try (
70-
BrowserWebDriverContainer webDriverContainer = new BrowserWebDriverContainer<>()
69+
BrowserWebDriverContainer<?> webDriverContainer = new BrowserWebDriverContainer<>(FIREFOX_IMAGE)
7170
.withSharedMemorySize(512 * FileUtils.ONE_MB)
72-
.withCapabilities(new FirefoxOptions())
7371
) {
7472
webDriverContainer.start();
7573

@@ -81,7 +79,7 @@ public void createContainerWithoutShmVolume() {
8179
}
8280
}
8381

84-
private List<InspectContainerResponse.Mount> shmVolumes(final BrowserWebDriverContainer container) {
82+
private List<InspectContainerResponse.Mount> shmVolumes(final BrowserWebDriverContainer<?> container) {
8583
return container.getContainerInfo().getMounts()
8684
.stream()
8785
// destination path is always /dev/shm

modules/selenium/src/test/java/org/testcontainers/junit/ContainerWithoutCapabilitiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public class ContainerWithoutCapabilitiesTest extends BaseWebDriverContainerTest{
88

99
@Rule
10-
public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>()
10+
public BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>("selenium/standalone-chrome:4.1.1")
1111
.withNetwork(NETWORK);
1212

1313
@Test

modules/selenium/src/test/java/org/testcontainers/junit/CustomWaitTimeoutWebDriverContainerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
public class CustomWaitTimeoutWebDriverContainerTest extends BaseWebDriverContainerTest {
1616

1717
@Rule
18-
public BrowserWebDriverContainer<?> chromeWithCustomTimeout = new BrowserWebDriverContainer<>()
19-
.withCapabilities(new ChromeOptions())
18+
public BrowserWebDriverContainer<?> chromeWithCustomTimeout = new BrowserWebDriverContainer<>("selenium/standalone-chrome:4.1.1")
2019
.withStartupTimeout(Duration.of(30, SECONDS))
2120
.withNetwork(NETWORK);
2221

modules/selenium/src/test/java/org/testcontainers/junit/SeleniumStartTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SeleniumStartTest {
1515

1616
@Parameterized.Parameters(name = "tag: {0}")
1717
public static String[] data() {
18-
return new String[]{"4.0.0", "3.4.0", "2.53.0", "2.45.0"};
18+
return new String[]{"4.0.0", "3.4.0"};
1919
}
2020

2121
@Parameterized.Parameter()

modules/selenium/src/test/java/org/testcontainers/junit/SpecificImageNameWebDriverContainerTest.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)