Skip to content

Move K3s tests to JUnit Jupiter #10741

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

Merged
eddumelendez merged 1 commit into from
Sep 3, 2025
Merged

Move K3s tests to JUnit Jupiter #10741

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
7 changes: 7 additions & 0 deletions modules/k3s/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ dependencies {
// Synchronize with the jackson version, must match major and minor version
shaded 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.4'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'

testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
testImplementation 'io.fabric8:kubernetes-client:7.3.1'
testImplementation 'io.kubernetes:client-java:24.0.0-legacy'
testImplementation 'org.assertj:assertj-core:3.27.4'
}

test {
useJUnitPlatform()
}
6 changes: 3 additions & 3 deletions modules/k3s/src/test/java/org/testcontainers/k3s/Fabric8K3sContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.dsl.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.utility.DockerImageName;

Expand All @@ -22,10 +22,10 @@
import static org.assertj.core.api.Assertions.assertThat;

@Slf4j
public class Fabric8K3sContainerTest {
class Fabric8K3sContainerTest {

@Test
public void shouldStartAndHaveListableNode() {
void shouldStartAndHaveListableNode() {
try (
// starting_k3s {
K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
Expand Down
28 changes: 20 additions & 8 deletions modules/k3s/src/test/java/org/testcontainers/k3s/KubectlContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.testcontainers.k3s;

import org.junit.ClassRule;
import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.startupcheck.OneShotStartupCheckStrategy;
Expand All @@ -11,16 +12,26 @@
import java.time.Duration;

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

public class KubectlContainerTest {
class KubectlContainerTest {

public static Network network = Network.SHARED;
private static final Network network = Network.SHARED;

@ClassRule
public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
private static final K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.21.3-k3s1"))
.withNetwork(network)
.withNetworkAliases("k3s");

@BeforeAll
static void setup() {
k3s.start();
}

@AfterAll
static void teardown() {
k3s.stop();
}

@Test
public void shouldExposeKubeConfigForNetworkAlias() throws Exception {
String kubeConfigYaml = k3s.generateInternalKubeConfigYaml("k3s");
Expand All @@ -38,8 +49,9 @@ public void shouldExposeKubeConfigForNetworkAlias() throws Exception {
}
}

@Test(expected = IllegalArgumentException.class)
@Test
public void shouldThrowAnExceptionForUnknownNetworkAlias() {
k3s.generateInternalKubeConfigYaml("not-set-network-alias");
assertThatThrownBy(() -> k3s.generateInternalKubeConfigYaml("not-set-network-alias"))
.isInstanceOf(IllegalArgumentException.class);
}
}
Loading