Skip to content

Upgrade to testcontainers 2.0 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to testcontainers 2.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ publishing {
}

dependencies {
api 'org.testcontainers:testcontainers:1.20.3'
api 'org.testcontainers:testcontainers:2.0.1'

testImplementation(platform('org.junit:junit-bom:6.0.0'))
testImplementation('org.junit.jupiter:junit-jupiter')
testRuntimeOnly('org.junit.platform:junit-platform-launcher')

testImplementation 'org.assertj:assertj-core:3.24.2'
testImplementation 'ch.qos.logback:logback-classic:1.3.5'
Expand Down
29 changes: 27 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gemfire.version>10.1.1</gemfire.version>
<testcontainers.version>2.0.1</testcontainers.version>
<junit.version>6.0.0</junit.version>
</properties>

<repositories>
Expand All @@ -45,11 +47,34 @@
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>${testcontainers.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.20.3</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
Expand All @@ -61,7 +86,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.13</version>
<version>1.3.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
16 changes: 1 addition & 15 deletions src/main/java/com/vmware/gemfire/testcontainers/GemFireCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import org.junit.runner.Description;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.FailureDetectingExternalResource;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.output.OutputFrame;
Expand Down Expand Up @@ -61,7 +59,7 @@
* Note that locators are named "locator-0", "locator-1", ... "locator-N" and servers are similarly
* named "server-0", "server-1", ... "server-N".
*/
public class GemFireCluster extends FailureDetectingExternalResource implements Closeable {
public class GemFireCluster implements Closeable {

public static final String DEFAULT_IMAGE =
System.getProperty("gemfire.image", "gemfire/gemfire:10.1");
Expand Down Expand Up @@ -171,18 +169,6 @@ public void start() {
postDeployGfsh.run();
}

@Override
protected void starting(Description description) {
super.starting(description);
start();
}

@Override
protected void finished(Description description) {
super.finished(description);
close();
}

/**
* Stop all locator and server containers
*/
Expand Down
18 changes: 12 additions & 6 deletions src/test/java/com/vmware/gemfire/testcontainers/GemFireTestcontainersRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,29 @@

package com.vmware.gemfire.testcontainers;

import static org.assertj.core.api.Assertions.assertThat;

import org.junit.Rule;
import org.junit.Test;

import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;

import org.junit.jupiter.api.*;

public class GemFireTestcontainersRuleTest {

@Rule
public GemFireCluster cluster = new GemFireCluster()
.acceptLicense()
.withGfsh(true, "list members", "create region --name=BAZ --type=REPLICATE");

@BeforeEach
public void setup() {
cluster.start();
}

@AfterEach
public void teardown() {
cluster.close();
}

@Test
public void testSetupWithRule() {
try (ClientCache cache = new ClientCacheFactory()
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/vmware/gemfire/testcontainers/GemFireTestcontainersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;

import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
import org.testcontainers.images.builder.Transferable;
Expand Down