From 782ee34cb735c0d3f8e867f04efb31a4afe2b46d Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 7 Feb 2023 13:26:43 +0100 Subject: [PATCH] Update @DynamicPropertySource examples regarding changes in Testcontainers Closes gh-29939 --- .../test/context/DynamicPropertySource.java | 10 ++++++---- src/docs/asciidoc/testing.adoc | 16 ++++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/DynamicPropertySource.java b/spring-test/src/main/java/org/springframework/test/context/DynamicPropertySource.java index 0474f9856b..1ebdc425ff 100644 --- a/spring-test/src/main/java/org/springframework/test/context/DynamicPropertySource.java +++ b/spring-test/src/main/java/org/springframework/test/context/DynamicPropertySource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2023 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. @@ -70,14 +70,16 @@ import java.lang.annotation.Target; * class ExampleIntegrationTests { * * @Container - * static RedisContainer redis = new RedisContainer(); + * static GenericContainer redis = + * new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine")) + * .withExposedPorts(6379); * * // ... * * @DynamicPropertySource * static void redisProperties(DynamicPropertyRegistry registry) { - * registry.add("redis.host", redis::getContainerIpAddress); - * registry.add("redis.port", redis::getMappedPort); + * registry.add("redis.host", redis::getHost); + * registry.add("redis.port", redis::getFirstMappedPort); * } * * } diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc index de0c5b6564..043939cbee 100644 --- a/src/docs/asciidoc/testing.adoc +++ b/src/docs/asciidoc/testing.adoc @@ -4342,12 +4342,14 @@ properties. class ExampleIntegrationTests { @Container - static RedisContainer redis = new RedisContainer(); + static GenericContainer redis = + new GenericContainer(DockerImageName.parse("redis:5.0.3-alpine")) + .withExposedPorts(6379); @DynamicPropertySource static void redisProperties(DynamicPropertyRegistry registry) { - registry.add("redis.host", redis::getContainerIpAddress); - registry.add("redis.port", redis::getMappedPort); + registry.add("redis.host", redis::getHost); + registry.add("redis.port", redis::getFirstMappedPort); } // tests ... @@ -4365,13 +4367,15 @@ properties. @Container @JvmStatic - val redis: RedisContainer = RedisContainer() + val redis: GenericContainer = + GenericContainer(DockerImageName.parse("redis:5.0.3-alpine")) + .withExposedPorts(6379) @DynamicPropertySource @JvmStatic fun redisProperties(registry: DynamicPropertyRegistry) { - registry.add("redis.host", redis::getContainerIpAddress) - registry.add("redis.port", redis::getMappedPort) + registry.add("redis.host", redis::getHost) + registry.add("redis.port", redis::getFirstMappedPort) } }