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
0c2bf70b
Commit
0c2bf70b
authored
May 16, 2020
by
olivier lamy
Committed by
Stephane Nicoll
May 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the container IP address for tests using TestContainer
See gh-21480
parent
afcb5d54
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
6 deletions
+13
-6
CouchbaseAutoConfigurationIntegrationTests.java
...couchbase/CouchbaseAutoConfigurationIntegrationTests.java
+1
-1
CassandraDataAutoConfigurationIntegrationTests.java
...andra/CassandraDataAutoConfigurationIntegrationTests.java
+2
-1
SessionAutoConfigurationRedisTests.java
...configure/session/SessionAutoConfigurationRedisTests.java
+8
-4
DataRedisTestIntegrationTests.java
...toconfigure/data/redis/DataRedisTestIntegrationTests.java
+1
-0
DataRedisTestWithIncludeFilterIntegrationTests.java
...redis/DataRedisTestWithIncludeFilterIntegrationTests.java
+1
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java
View file @
0c2bf70b
...
@@ -74,7 +74,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
...
@@ -74,7 +74,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
void
setUp
()
{
void
setUp
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
.
register
(
CouchbaseAutoConfiguration
.
class
);
this
.
context
.
register
(
CouchbaseAutoConfiguration
.
class
);
TestPropertyValues
.
of
(
"spring.couchbase.bootstrap-hosts=
localhost"
,
TestPropertyValues
.
of
(
"spring.couchbase.bootstrap-hosts=
"
+
couchbase
.
getContainerIpAddress
()
,
"spring.couchbase.env.bootstrap.http-direct-port:"
+
couchbase
.
getMappedPort
(
8091
),
"spring.couchbase.env.bootstrap.http-direct-port:"
+
couchbase
.
getMappedPort
(
8091
),
"spring.couchbase.username:spring"
,
"spring.couchbase.password:password"
,
"spring.couchbase.username:spring"
,
"spring.couchbase.password:password"
,
"spring.couchbase.bucket.name:default"
).
applyTo
(
this
.
context
.
getEnvironment
());
"spring.couchbase.bucket.name:default"
).
applyTo
(
this
.
context
.
getEnvironment
());
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View file @
0c2bf70b
...
@@ -56,7 +56,8 @@ class CassandraDataAutoConfigurationIntegrationTests {
...
@@ -56,7 +56,8 @@ class CassandraDataAutoConfigurationIntegrationTests {
void
setUp
()
{
void
setUp
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
=
new
AnnotationConfigApplicationContext
();
TestPropertyValues
TestPropertyValues
.
of
(
"spring.data.cassandra.port="
+
cassandra
.
getFirstMappedPort
(),
.
of
(
"spring.data.cassandra.contact-points="
+
cassandra
.
getContainerIpAddress
(),
"spring.data.cassandra.port="
+
cassandra
.
getFirstMappedPort
(),
"spring.data.cassandra.read-timeout=24000"
,
"spring.data.cassandra.connect-timeout=10000"
)
"spring.data.cassandra.read-timeout=24000"
,
"spring.data.cassandra.connect-timeout=10000"
)
.
applyTo
(
this
.
context
.
getEnvironment
());
.
applyTo
(
this
.
context
.
getEnvironment
());
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationRedisTests.java
View file @
0c2bf70b
...
@@ -63,9 +63,8 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
...
@@ -63,9 +63,8 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
@Test
@Test
void
defaultConfig
()
{
void
defaultConfig
()
{
this
.
contextRunner
this
.
contextRunner
.
withPropertyValues
(
"spring.session.store-type=redis"
,
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.redis.host="
+
redis
.
getContainerIpAddress
(),
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
run
(
validateSpringSessionUsesRedis
(
"spring:session:event:0:created:"
,
FlushMode
.
ON_SAVE
,
.
run
(
validateSpringSessionUsesRedis
(
"spring:session:event:0:created:"
,
FlushMode
.
ON_SAVE
,
SaveMode
.
ON_SET_ATTRIBUTE
,
"0 * * * * *"
));
SaveMode
.
ON_SET_ATTRIBUTE
,
"0 * * * * *"
));
...
@@ -77,7 +76,8 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
...
@@ -77,7 +76,8 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
.
withClassLoader
(
new
FilteredClassLoader
(
HazelcastIndexedSessionRepository
.
class
,
.
withClassLoader
(
new
FilteredClassLoader
(
HazelcastIndexedSessionRepository
.
class
,
JdbcIndexedSessionRepository
.
class
,
MongoIndexedSessionRepository
.
class
))
JdbcIndexedSessionRepository
.
class
,
MongoIndexedSessionRepository
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withPropertyValues
(
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
withPropertyValues
(
"spring.redis.host="
+
redis
.
getContainerIpAddress
(),
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
run
(
validateSpringSessionUsesRedis
(
"spring:session:event:0:created:"
,
FlushMode
.
ON_SAVE
,
.
run
(
validateSpringSessionUsesRedis
(
"spring:session:event:0:created:"
,
FlushMode
.
ON_SAVE
,
SaveMode
.
ON_SET_ATTRIBUTE
,
"0 * * * * *"
));
SaveMode
.
ON_SET_ATTRIBUTE
,
"0 * * * * *"
));
}
}
...
@@ -88,6 +88,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
...
@@ -88,6 +88,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.session.redis.namespace=foo"
,
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.session.redis.namespace=foo"
,
"spring.session.redis.flush-mode=immediate"
,
"spring.session.redis.save-mode=on-get-attribute"
,
"spring.session.redis.flush-mode=immediate"
,
"spring.session.redis.save-mode=on-get-attribute"
,
"spring.session.redis.cleanup-cron=0 0 12 * * *"
,
"spring.session.redis.cleanup-cron=0 0 12 * * *"
,
"spring.redis.host="
+
redis
.
getContainerIpAddress
(),
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
run
(
validateSpringSessionUsesRedis
(
"foo:event:0:created:"
,
FlushMode
.
IMMEDIATE
,
.
run
(
validateSpringSessionUsesRedis
(
"foo:event:0:created:"
,
FlushMode
.
IMMEDIATE
,
SaveMode
.
ON_GET_ATTRIBUTE
,
"0 0 12 * * *"
));
SaveMode
.
ON_GET_ATTRIBUTE
,
"0 0 12 * * *"
));
...
@@ -97,6 +98,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
...
@@ -97,6 +98,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
void
redisSessionWithConfigureActionNone
()
{
void
redisSessionWithConfigureActionNone
()
{
this
.
contextRunner
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
this
.
contextRunner
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.session.redis.configure-action=none"
,
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.session.redis.configure-action=none"
,
"spring.redis.host="
+
redis
.
getContainerIpAddress
(),
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
run
(
validateStrategy
(
ConfigureRedisAction
.
NO_OP
.
getClass
()));
.
run
(
validateStrategy
(
ConfigureRedisAction
.
NO_OP
.
getClass
()));
}
}
...
@@ -105,6 +107,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
...
@@ -105,6 +107,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
void
redisSessionWithDefaultConfigureActionNone
()
{
void
redisSessionWithDefaultConfigureActionNone
()
{
this
.
contextRunner
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
this
.
contextRunner
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withPropertyValues
(
"spring.session.store-type=redis"
,
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.redis.host="
+
redis
.
getContainerIpAddress
(),
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
run
(
validateStrategy
(
ConfigureNotifyKeyspaceEventsAction
.
class
,
.
run
(
validateStrategy
(
ConfigureNotifyKeyspaceEventsAction
.
class
,
entry
(
"notify-keyspace-events"
,
"gxE"
)));
entry
(
"notify-keyspace-events"
,
"gxE"
)));
...
@@ -115,6 +118,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
...
@@ -115,6 +118,7 @@ class SessionAutoConfigurationRedisTests extends AbstractSessionAutoConfiguratio
this
.
contextRunner
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
this
.
contextRunner
.
withConfiguration
(
AutoConfigurations
.
of
(
RedisAutoConfiguration
.
class
))
.
withUserConfiguration
(
MaxEntriesRedisAction
.
class
)
.
withUserConfiguration
(
MaxEntriesRedisAction
.
class
)
.
withPropertyValues
(
"spring.session.store-type=redis"
,
.
withPropertyValues
(
"spring.session.store-type=redis"
,
"spring.redis.host="
+
redis
.
getContainerIpAddress
(),
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
"spring.redis.port="
+
redis
.
getFirstMappedPort
())
.
run
(
validateStrategy
(
MaxEntriesRedisAction
.
class
,
entry
(
"set-max-intset-entries"
,
"1024"
)));
.
run
(
validateStrategy
(
MaxEntriesRedisAction
.
class
,
entry
(
"set-max-intset-entries"
,
"1024"
)));
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestIntegrationTests.java
View file @
0c2bf70b
...
@@ -61,6 +61,7 @@ class DataRedisTestIntegrationTests {
...
@@ -61,6 +61,7 @@ class DataRedisTestIntegrationTests {
@DynamicPropertySource
@DynamicPropertySource
static
void
redisProperties
(
DynamicPropertyRegistry
registry
)
{
static
void
redisProperties
(
DynamicPropertyRegistry
registry
)
{
registry
.
add
(
"spring.redis.port"
,
redis:
:
getFirstMappedPort
);
registry
.
add
(
"spring.redis.port"
,
redis:
:
getFirstMappedPort
);
registry
.
add
(
"spring.redis.host"
,
redis:
:
getContainerIpAddress
);
}
}
@Test
@Test
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/redis/DataRedisTestWithIncludeFilterIntegrationTests.java
View file @
0c2bf70b
...
@@ -50,6 +50,7 @@ class DataRedisTestWithIncludeFilterIntegrationTests {
...
@@ -50,6 +50,7 @@ class DataRedisTestWithIncludeFilterIntegrationTests {
@DynamicPropertySource
@DynamicPropertySource
static
void
redisProperties
(
DynamicPropertyRegistry
registry
)
{
static
void
redisProperties
(
DynamicPropertyRegistry
registry
)
{
registry
.
add
(
"spring.redis.port"
,
redis:
:
getFirstMappedPort
);
registry
.
add
(
"spring.redis.port"
,
redis:
:
getFirstMappedPort
);
registry
.
add
(
"spring.redis.host"
,
redis:
:
getContainerIpAddress
);
}
}
@Test
@Test
...
...
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