Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
07b857e5
Commit
07b857e5
authored
Sep 02, 2019
by
dreis2211
Committed by
Stephane Nicoll
Sep 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use disabledWithoutDocker option for @Testcontainers
See gh-18095
parent
594e2084
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
32 additions
and
115 deletions
+32
-115
CassandraDataAutoConfigurationIntegrationTests.java
...andra/CassandraDataAutoConfigurationIntegrationTests.java
+2
-2
ElasticsearchAutoConfigurationTests.java
...ta/elasticsearch/ElasticsearchAutoConfigurationTests.java
+2
-2
ElasticsearchDataAutoConfigurationTests.java
...lasticsearch/ElasticsearchDataAutoConfigurationTests.java
+2
-2
ElasticsearchRepositoriesAutoConfigurationTests.java
...arch/ElasticsearchRepositoriesAutoConfigurationTests.java
+2
-2
ReactiveElasticsearchRepositoriesAutoConfigurationTests.java
...ctiveElasticsearchRepositoriesAutoConfigurationTests.java
+2
-2
ReactiveRestClientAutoConfigurationTests.java
...asticsearch/ReactiveRestClientAutoConfigurationTests.java
+2
-2
RedisRepositoriesAutoConfigurationTests.java
...e/data/redis/RedisRepositoriesAutoConfigurationTests.java
+2
-2
JestAutoConfigurationTests.java
...figure/elasticsearch/jest/JestAutoConfigurationTests.java
+2
-2
RestClientAutoConfigurationTests.java
.../elasticsearch/rest/RestClientAutoConfigurationTests.java
+2
-2
SessionAutoConfigurationRedisTests.java
...configure/session/SessionAutoConfigurationRedisTests.java
+2
-2
DataNeo4jTestIntegrationTests.java
...toconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java
+2
-2
DataNeo4jTestPropertiesIntegrationTests.java
...e/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java
+2
-2
DataNeo4jTestWithIncludeFilterIntegrationTests.java
...neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java
+2
-2
DataRedisTestIntegrationTests.java
...toconfigure/data/redis/DataRedisTestIntegrationTests.java
+2
-2
DataRedisTestPropertiesIntegrationTests.java
...e/data/redis/DataRedisTestPropertiesIntegrationTests.java
+2
-2
DataRedisTestWithIncludeFilterIntegrationTests.java
...redis/DataRedisTestWithIncludeFilterIntegrationTests.java
+2
-2
DisabledWithoutDockerTestcontainers.java
...t/testcontainers/DisabledWithoutDockerTestcontainers.java
+0
-40
DockerIsAvailableCondition.java
...estsupport/testcontainers/DockerIsAvailableCondition.java
+0
-43
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View file @
07b857e5
...
@@ -25,12 +25,12 @@ import org.junit.jupiter.api.BeforeEach;
...
@@ -25,12 +25,12 @@ import org.junit.jupiter.api.BeforeEach;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.containers.CassandraContainer
;
import
org.testcontainers.containers.CassandraContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurationPackages
;
import
org.springframework.boot.autoconfigure.AutoConfigurationPackages
;
import
org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration
;
import
org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration
;
import
org.springframework.boot.autoconfigure.data.cassandra.city.City
;
import
org.springframework.boot.autoconfigure.data.cassandra.city.City
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.data.cassandra.config.CassandraSessionFactoryBean
;
import
org.springframework.data.cassandra.config.CassandraSessionFactoryBean
;
import
org.springframework.data.cassandra.config.SchemaAction
;
import
org.springframework.data.cassandra.config.SchemaAction
;
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Mark Paluch
* @author Mark Paluch
* @author Stephane Nicoll
* @author Stephane Nicoll
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
CassandraDataAutoConfigurationIntegrationTests
{
class
CassandraDataAutoConfigurationIntegrationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java
View file @
07b857e5
...
@@ -26,10 +26,10 @@ import org.junit.jupiter.api.BeforeEach;
...
@@ -26,10 +26,10 @@ import org.junit.jupiter.api.BeforeEach;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
...
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock;
...
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock;
* @author Phillip Webb
* @author Phillip Webb
* @author Andy Wilkinson
* @author Andy Wilkinson
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
ElasticsearchAutoConfigurationTests
{
class
ElasticsearchAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
View file @
07b857e5
...
@@ -23,11 +23,11 @@ import org.junit.jupiter.api.BeforeEach;
...
@@ -23,11 +23,11 @@ import org.junit.jupiter.api.BeforeEach;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration
;
import
org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.elasticsearch.core.ElasticsearchEntityMapper
;
import
org.springframework.data.elasticsearch.core.ElasticsearchEntityMapper
;
...
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.mock;
...
@@ -49,7 +49,7 @@ import static org.mockito.Mockito.mock;
* @author Brian Clozel
* @author Brian Clozel
* @author Peter-Josef Meisch
* @author Peter-Josef Meisch
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
ElasticsearchDataAutoConfigurationTests
{
class
ElasticsearchDataAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java
View file @
07b857e5
...
@@ -21,6 +21,7 @@ import java.time.Duration;
...
@@ -21,6 +21,7 @@ import java.time.Duration;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.TestAutoConfigurationPackage
;
import
org.springframework.boot.autoconfigure.TestAutoConfigurationPackage
;
...
@@ -30,7 +31,6 @@ import org.springframework.boot.autoconfigure.data.elasticsearch.city.CityReposi
...
@@ -30,7 +31,6 @@ import org.springframework.boot.autoconfigure.data.elasticsearch.city.CityReposi
import
org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage
;
import
org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage
;
import
org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration
;
import
org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories
;
import
org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories
;
...
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andy Wilkinson
* @author Andy Wilkinson
* @author Brian Clozel
* @author Brian Clozel
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
ElasticsearchRepositoriesAutoConfigurationTests
{
class
ElasticsearchRepositoriesAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfigurationTests.java
View file @
07b857e5
...
@@ -21,6 +21,7 @@ import java.time.Duration;
...
@@ -21,6 +21,7 @@ import java.time.Duration;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.TestAutoConfigurationPackage
;
import
org.springframework.boot.autoconfigure.TestAutoConfigurationPackage
;
...
@@ -29,7 +30,6 @@ import org.springframework.boot.autoconfigure.data.elasticsearch.city.City;
...
@@ -29,7 +30,6 @@ import org.springframework.boot.autoconfigure.data.elasticsearch.city.City;
import
org.springframework.boot.autoconfigure.data.elasticsearch.city.ReactiveCityRepository
;
import
org.springframework.boot.autoconfigure.data.elasticsearch.city.ReactiveCityRepository
;
import
org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage
;
import
org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate
;
import
org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate
;
import
org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories
;
import
org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories
;
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andy Wilkinson
* @author Andy Wilkinson
* @author Brian Clozel
* @author Brian Clozel
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
public
class
ReactiveElasticsearchRepositoriesAutoConfigurationTests
{
public
class
ReactiveElasticsearchRepositoriesAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfigurationTests.java
View file @
07b857e5
...
@@ -26,10 +26,10 @@ import org.elasticsearch.index.get.GetResult;
...
@@ -26,10 +26,10 @@ import org.elasticsearch.index.get.GetResult;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.elasticsearch.client.ClientConfiguration
;
import
org.springframework.data.elasticsearch.client.ClientConfiguration
;
...
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock;
...
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock;
*
*
* @author Brian Clozel
* @author Brian Clozel
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
public
class
ReactiveRestClientAutoConfigurationTests
{
public
class
ReactiveRestClientAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisRepositoriesAutoConfigurationTests.java
View file @
07b857e5
...
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.AfterEach;
...
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.AfterEach;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.TestAutoConfigurationPackage
;
import
org.springframework.boot.autoconfigure.TestAutoConfigurationPackage
;
import
org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
;
...
@@ -30,7 +31,6 @@ import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage;
...
@@ -30,7 +31,6 @@ import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage;
import
org.springframework.boot.autoconfigure.data.redis.city.City
;
import
org.springframework.boot.autoconfigure.data.redis.city.City
;
import
org.springframework.boot.autoconfigure.data.redis.city.CityRepository
;
import
org.springframework.boot.autoconfigure.data.redis.city.CityRepository
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
*
* @author Eddú Meléndez
* @author Eddú Meléndez
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
RedisRepositoriesAutoConfigurationTests
{
class
RedisRepositoriesAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java
View file @
07b857e5
...
@@ -31,12 +31,12 @@ import io.searchbox.core.Index;
...
@@ -31,12 +31,12 @@ import io.searchbox.core.Index;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.BeanCreationException
;
import
org.springframework.beans.factory.BeanCreationException
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
;
import
org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.context.annotation.Import
;
...
@@ -51,7 +51,7 @@ import static org.mockito.Mockito.mock;
...
@@ -51,7 +51,7 @@ import static org.mockito.Mockito.mock;
* @author Andy Wilkinson
* @author Andy Wilkinson
*/
*/
@Deprecated
@Deprecated
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
JestAutoConfigurationTests
{
class
JestAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java
View file @
07b857e5
...
@@ -29,11 +29,11 @@ import org.elasticsearch.client.RestHighLevelClient;
...
@@ -29,11 +29,11 @@ import org.elasticsearch.client.RestHighLevelClient;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.elasticsearch.ElasticsearchContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.FilteredClassLoader
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.test.util.ReflectionTestUtils
;
import
org.springframework.test.util.ReflectionTestUtils
;
...
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.mock;
...
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.mock;
*
*
* @author Brian Clozel
* @author Brian Clozel
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
RestClientAutoConfigurationTests
{
class
RestClientAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java
View file @
07b857e5
...
@@ -21,6 +21,7 @@ import java.util.Map;
...
@@ -21,6 +21,7 @@ import java.util.Map;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration
;
import
org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration
;
...
@@ -29,7 +30,6 @@ import org.springframework.boot.test.context.FilteredClassLoader;
...
@@ -29,7 +30,6 @@ import org.springframework.boot.test.context.FilteredClassLoader;
import
org.springframework.boot.test.context.assertj.AssertableWebApplicationContext
;
import
org.springframework.boot.test.context.assertj.AssertableWebApplicationContext
;
import
org.springframework.boot.test.context.runner.ContextConsumer
;
import
org.springframework.boot.test.context.runner.ContextConsumer
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.WebApplicationContextRunner
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.data.redis.connection.RedisConnection
;
import
org.springframework.data.redis.connection.RedisConnection
;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
import
org.springframework.data.redis.connection.RedisConnectionFactory
;
...
@@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.entry;
...
@@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.entry;
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Vedran Pavic
* @author Vedran Pavic
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
SessionAutoConfigurationRedisTests
extends
AbstractSessionAutoConfigurationTests
{
class
SessionAutoConfigurationRedisTests
extends
AbstractSessionAutoConfigurationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java
View file @
07b857e5
...
@@ -20,11 +20,11 @@ import org.junit.jupiter.api.Test;
...
@@ -20,11 +20,11 @@ import org.junit.jupiter.api.Test;
import
org.neo4j.ogm.session.Session
;
import
org.neo4j.ogm.session.Session
;
import
org.testcontainers.containers.Neo4jContainer
;
import
org.testcontainers.containers.Neo4jContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.NoSuchBeanDefinitionException
;
import
org.springframework.beans.factory.NoSuchBeanDefinitionException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.ConfigurableApplicationContext
;
...
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
...
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
*/
*/
@ContextConfiguration
(
initializers
=
DataNeo4jTestIntegrationTests
.
Initializer
.
class
)
@ContextConfiguration
(
initializers
=
DataNeo4jTestIntegrationTests
.
Initializer
.
class
)
@DataNeo4jTest
@DataNeo4jTest
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
class
DataNeo4jTestIntegrationTests
{
class
DataNeo4jTestIntegrationTests
{
@Container
@Container
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java
View file @
07b857e5
...
@@ -19,10 +19,10 @@ package org.springframework.boot.test.autoconfigure.data.neo4j;
...
@@ -19,10 +19,10 @@ package org.springframework.boot.test.autoconfigure.data.neo4j;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.containers.Neo4jContainer
;
import
org.testcontainers.containers.Neo4jContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
...
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
*
* @author Artsiom Yudovin
* @author Artsiom Yudovin
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
@ContextConfiguration
(
initializers
=
DataNeo4jTestPropertiesIntegrationTests
.
Initializer
.
class
)
@ContextConfiguration
(
initializers
=
DataNeo4jTestPropertiesIntegrationTests
.
Initializer
.
class
)
@DataNeo4jTest
(
properties
=
"spring.profiles.active=test"
)
@DataNeo4jTest
(
properties
=
"spring.profiles.active=test"
)
class
DataNeo4jTestPropertiesIntegrationTests
{
class
DataNeo4jTestPropertiesIntegrationTests
{
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java
View file @
07b857e5
...
@@ -19,10 +19,10 @@ package org.springframework.boot.test.autoconfigure.data.neo4j;
...
@@ -19,10 +19,10 @@ package org.springframework.boot.test.autoconfigure.data.neo4j;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.containers.Neo4jContainer
;
import
org.testcontainers.containers.Neo4jContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.ComponentScan.Filter
;
import
org.springframework.context.annotation.ComponentScan.Filter
;
...
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Eddú Meléndez
* @author Eddú Meléndez
* @author Michael Simons
* @author Michael Simons
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
@ContextConfiguration
(
initializers
=
DataNeo4jTestWithIncludeFilterIntegrationTests
.
Initializer
.
class
)
@ContextConfiguration
(
initializers
=
DataNeo4jTestWithIncludeFilterIntegrationTests
.
Initializer
.
class
)
@DataNeo4jTest
(
includeFilters
=
@Filter
(
Service
.
class
))
@DataNeo4jTest
(
includeFilters
=
@Filter
(
Service
.
class
))
class
DataNeo4jTestWithIncludeFilterIntegrationTests
{
class
DataNeo4jTestWithIncludeFilterIntegrationTests
{
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java
View file @
07b857e5
...
@@ -21,11 +21,11 @@ import java.nio.charset.StandardCharsets;
...
@@ -21,11 +21,11 @@ import java.nio.charset.StandardCharsets;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.NoSuchBeanDefinitionException
;
import
org.springframework.beans.factory.NoSuchBeanDefinitionException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ApplicationContextInitializer
;
...
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
...
@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
*
*
* @author Jayaram Pradhan
* @author Jayaram Pradhan
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
@ContextConfiguration
(
initializers
=
DataRedisTestIntegrationTests
.
Initializer
.
class
)
@ContextConfiguration
(
initializers
=
DataRedisTestIntegrationTests
.
Initializer
.
class
)
@DataRedisTest
@DataRedisTest
class
DataRedisTestIntegrationTests
{
class
DataRedisTestIntegrationTests
{
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestPropertiesIntegrationTests.java
View file @
07b857e5
...
@@ -18,10 +18,10 @@ package org.springframework.boot.test.autoconfigure.data.redis;
...
@@ -18,10 +18,10 @@ package org.springframework.boot.test.autoconfigure.data.redis;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.ConfigurableApplicationContext
;
...
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
*
* @author Artsiom Yudovin
* @author Artsiom Yudovin
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
@ContextConfiguration
(
initializers
=
DataRedisTestPropertiesIntegrationTests
.
Initializer
.
class
)
@ContextConfiguration
(
initializers
=
DataRedisTestPropertiesIntegrationTests
.
Initializer
.
class
)
@DataRedisTest
(
properties
=
"spring.profiles.active=test"
)
@DataRedisTest
(
properties
=
"spring.profiles.active=test"
)
class
DataRedisTestPropertiesIntegrationTests
{
class
DataRedisTestPropertiesIntegrationTests
{
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java
View file @
07b857e5
...
@@ -18,10 +18,10 @@ package org.springframework.boot.test.autoconfigure.data.redis;
...
@@ -18,10 +18,10 @@ package org.springframework.boot.test.autoconfigure.data.redis;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.test.util.TestPropertyValues
;
import
org.springframework.boot.testsupport.testcontainers.DisabledWithoutDockerTestcontainers
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.boot.testsupport.testcontainers.RedisContainer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ApplicationContextInitializer
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.ConfigurableApplicationContext
;
...
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
*
* @author Jayaram Pradhan
* @author Jayaram Pradhan
*/
*/
@
DisabledWithoutDockerTestcontainers
@
Testcontainers
(
disabledWithoutDocker
=
true
)
@ContextConfiguration
(
initializers
=
DataRedisTestWithIncludeFilterIntegrationTests
.
Initializer
.
class
)
@ContextConfiguration
(
initializers
=
DataRedisTestWithIncludeFilterIntegrationTests
.
Initializer
.
class
)
@DataRedisTest
(
includeFilters
=
@Filter
(
Service
.
class
))
@DataRedisTest
(
includeFilters
=
@Filter
(
Service
.
class
))
class
DataRedisTestWithIncludeFilterIntegrationTests
{
class
DataRedisTestWithIncludeFilterIntegrationTests
{
...
...
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DisabledWithoutDockerTestcontainers.java
deleted
100644 → 0
View file @
594e2084
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
testsupport
.
testcontainers
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
import
org.junit.jupiter.api.extension.ExtendWith
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
/**
* Customization of {@link Testcontainers @Testcontainers} that disables the tests when
* Docker is not available.
*
* @author Andy Wilkinson
* @since 2.2.0
*/
@ExtendWith
(
DockerIsAvailableCondition
.
class
)
@Testcontainers
@Retention
(
RetentionPolicy
.
RUNTIME
)
@Target
(
ElementType
.
TYPE
)
public
@interface
DisabledWithoutDockerTestcontainers
{
}
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerIsAvailableCondition.java
deleted
100644 → 0
View file @
594e2084
/*
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
testsupport
.
testcontainers
;
import
org.junit.jupiter.api.extension.ConditionEvaluationResult
;
import
org.junit.jupiter.api.extension.ExecutionCondition
;
import
org.junit.jupiter.api.extension.ExtensionContext
;
import
org.testcontainers.DockerClientFactory
;
/**
* {@link ExecutionCondition} for
* {@link DisabledWithoutDockerTestcontainers @DisabledWithoutDockerTestcontainers}.
*
* @author Andy Wilkinson
*/
final
class
DockerIsAvailableCondition
implements
ExecutionCondition
{
@Override
public
ConditionEvaluationResult
evaluateExecutionCondition
(
ExtensionContext
context
)
{
try
{
DockerClientFactory
.
instance
().
client
();
return
ConditionEvaluationResult
.
enabled
(
"Docker is available"
);
}
catch
(
Throwable
ex
)
{
return
ConditionEvaluationResult
.
disabled
(
"Docker is not available: "
+
ex
.
getMessage
());
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment