Skip to content

Commit 41741f2

Browse files
garyrussellartembilan
authored andcommitted
Fix Testcontainer Tests With No Docker Running
Disable the tests, if Docker is not available.
1 parent 87aa29c commit 41741f2

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ext {
7070
springDataVersion = '2022.0.0'
7171
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0'
7272
springRetryVersion = '2.0.0'
73-
testContainersVersion = '1.17.6'
73+
testcontainersVersion = '1.17.6'
7474
zstdJniVersion = '1.5.0-2'
7575

7676
javaProjects = subprojects - project(':spring-amqp-bom')
@@ -104,6 +104,7 @@ allprojects {
104104
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
105105
mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
106106
mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion"
107+
mavenBom "org.testcontainers:testcontainers-bom:$testcontainersVersion"
107108
}
108109
}
109110

@@ -443,7 +444,8 @@ project('spring-rabbit') {
443444
testImplementation 'io.micrometer:micrometer-tracing-bridge-brave'
444445
testImplementation 'io.micrometer:micrometer-tracing-test'
445446
testImplementation 'io.micrometer:micrometer-tracing-integration-test'
446-
testImplementation "org.testcontainers:rabbitmq:$testContainersVersion"
447+
testImplementation "org.testcontainers:rabbitmq"
448+
testImplementation 'org.testcontainers:junit-jupiter'
447449
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-core'
448450
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-databind'
449451
testRuntimeOnly 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
@@ -480,7 +482,7 @@ project('spring-rabbit-stream') {
480482
testRuntimeOnly "org.xerial.snappy:snappy-java:$snappyVersion"
481483
testRuntimeOnly "org.lz4:lz4-java:$lz4Version"
482484
testRuntimeOnly "com.github.luben:zstd-jni:$zstdJniVersion"
483-
testImplementation "org.testcontainers:rabbitmq:$testContainersVersion"
485+
testImplementation "org.testcontainers:rabbitmq"
484486
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
485487
testImplementation 'org.springframework:spring-webflux'
486488
}
@@ -501,7 +503,8 @@ project('spring-rabbit-junit') {
501503
api 'org.springframework:spring-web'
502504
api 'org.junit.jupiter:junit-jupiter-api'
503505
api "org.assertj:assertj-core:$assertjVersion"
504-
optionalApi "org.testcontainers:rabbitmq:$testContainersVersion"
506+
optionalApi "org.testcontainers:rabbitmq"
507+
optionalApi "org.testcontainers:junit-jupiter"
505508
optionalApi "ch.qos.logback:logback-classic:$logbackVersion"
506509
optionalApi 'org.apache.logging.log4j:log4j-core'
507510
compileOnly 'org.apiguardian:apiguardian-api:1.0.0'

spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/AbstractTestContainerTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2022 the original author or authors.
2+
* Copyright 2021-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,13 +19,15 @@
1919
import java.time.Duration;
2020

2121
import org.testcontainers.containers.RabbitMQContainer;
22+
import org.testcontainers.junit.jupiter.Testcontainers;
2223
import org.testcontainers.utility.DockerImageName;
2324

2425
/**
2526
* @author Gary Russell
2627
* @since 2.4
2728
*
2829
*/
30+
@Testcontainers(disabledWithoutDocker = true)
2931
public abstract class AbstractTestContainerTests {
3032

3133
protected static final RabbitMQContainer RABBITMQ;

0 commit comments

Comments
 (0)