Skip to content

Commit 59139e6

Browse files
committed
Polish "Disable auto-detection in tests that start Hazelcast"
See gh-31863
1 parent aad9c89 commit 59139e6

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 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,6 +19,7 @@
1919
import java.util.Map;
2020

2121
import com.hazelcast.config.Config;
22+
import com.hazelcast.config.JoinConfig;
2223
import com.hazelcast.config.QueueConfig;
2324
import com.hazelcast.core.Hazelcast;
2425
import com.hazelcast.core.HazelcastInstance;
@@ -130,8 +131,7 @@ void unknownConfigFile() {
130131

131132
@Test
132133
void configInstanceWithName() {
133-
Config config = new Config("my-test-instance");
134-
config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(false);
134+
Config config = createTestConfig("my-test-instance");
135135
HazelcastInstance existing = Hazelcast.newHazelcastInstance(config);
136136
try {
137137
this.contextRunner.withUserConfiguration(HazelcastConfigWithName.class)
@@ -165,6 +165,14 @@ void autoConfiguredConfigUsesApplicationClassLoader() {
165165
});
166166
}
167167

168+
private static Config createTestConfig(String instanceName) {
169+
Config config = new Config(instanceName);
170+
JoinConfig join = config.getNetworkConfig().getJoin();
171+
join.getAutoDetectionConfig().setEnabled(false);
172+
join.getMulticastConfig().setEnabled(false);
173+
return config;
174+
}
175+
168176
@Configuration(proxyBeanMethods = false)
169177
static class HazelcastConfigWithName {
170178

@@ -180,8 +188,7 @@ static class HazelcastConfigNoName {
180188

181189
@Bean
182190
Config anotherHazelcastConfig() {
183-
Config config = new Config();
184-
config.getNetworkConfig().getJoin().getAutoDetectionConfig().setEnabled(false);
191+
Config config = createTestConfig("another-test-instance");
185192
config.addQueueConfig(new QueueConfig("another-queue"));
186193
return config;
187194
}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<network>
1313
<join>
14+
<auto-detection enabled="false"/>
1415
<multicast enabled="false"/>
1516
</join>
1617
</network>

0 commit comments

Comments
 (0)