Skip to content

Commit e99a781

Browse files
wind57wind57
authored
fix failling tests (#1812)
* typo * use AtomicBoolean in tests
1 parent 8cd9826 commit e99a781

File tree

9 files changed

+44
-33
lines changed

9 files changed

+44
-33
lines changed

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadConfigMapTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.Set;
23+
import java.util.concurrent.atomic.AtomicBoolean;
2324

2425
import com.github.tomakehurst.wiremock.WireMockServer;
2526
import com.github.tomakehurst.wiremock.client.WireMock;
@@ -81,7 +82,7 @@ class EventReloadConfigMapTest {
8182

8283
private static final String NAMESPACE = "spring-k8s";
8384

84-
private static final boolean[] strategyCalled = new boolean[] { false };
85+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
8586

8687
private static CoreV1Api coreV1Api;
8788

@@ -158,7 +159,7 @@ void test(CapturedOutput output) {
158159
boolean two = output.getOut().contains("Failed to load source");
159160
boolean three = output.getOut()
160161
.contains("Reloadable condition was not satisfied, reload will not be triggered");
161-
boolean updateStrategyNotCalled = !strategyCalled[0];
162+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
162163
return one && two && three && updateStrategyNotCalled;
163164
});
164165

@@ -168,7 +169,7 @@ void test(CapturedOutput output) {
168169
Awaitility.await()
169170
.atMost(Duration.ofSeconds(10))
170171
.pollInterval(Duration.ofSeconds(1))
171-
.until(() -> strategyCalled[0]);
172+
.until(STRATEGY_CALLED::get);
172173
}
173174

174175
private static V1ConfigMap configMap(String name, Map<String, String> data) {
@@ -237,7 +238,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
237238
@Primary
238239
ConfigurationUpdateStrategy configurationUpdateStrategy() {
239240
return new ConfigurationUpdateStrategy("to-console", () -> {
240-
strategyCalled[0] = true;
241+
STRATEGY_CALLED.set(true);
241242
});
242243
}
243244

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/EventReloadSecretTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222
import java.util.Map;
2323
import java.util.Set;
24+
import java.util.concurrent.atomic.AtomicBoolean;
2425
import java.util.stream.Collectors;
2526

2627
import com.github.tomakehurst.wiremock.WireMockServer;
@@ -83,7 +84,7 @@ class EventReloadSecretTest {
8384

8485
private static final String NAMESPACE = "spring-k8s";
8586

86-
private static final boolean[] strategyCalled = new boolean[] { false };
87+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
8788

8889
private static CoreV1Api coreV1Api;
8990

@@ -160,7 +161,7 @@ void test(CapturedOutput output) {
160161
boolean two = output.getOut().contains("Failed to load source");
161162
boolean three = output.getOut()
162163
.contains("Reloadable condition was not satisfied, reload will not be triggered");
163-
boolean updateStrategyNotCalled = !strategyCalled[0];
164+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
164165
return one && two && three && updateStrategyNotCalled;
165166
});
166167

@@ -170,7 +171,7 @@ void test(CapturedOutput output) {
170171
Awaitility.await()
171172
.atMost(Duration.ofSeconds(10))
172173
.pollInterval(Duration.ofSeconds(1))
173-
.until(() -> strategyCalled[0]);
174+
.until(STRATEGY_CALLED::get);
174175
}
175176

176177
private static V1Secret secret(String name, Map<String, String> data) {
@@ -242,7 +243,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
242243
@Primary
243244
ConfigurationUpdateStrategy configurationUpdateStrategy() {
244245
return new ConfigurationUpdateStrategy("to-console", () -> {
245-
strategyCalled[0] = true;
246+
STRATEGY_CALLED.set(true);
246247
});
247248
}
248249

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.Set;
23+
import java.util.concurrent.atomic.AtomicBoolean;
2324

2425
import com.github.tomakehurst.wiremock.WireMockServer;
2526
import com.github.tomakehurst.wiremock.client.WireMock;
@@ -79,7 +80,7 @@ class PollingReloadConfigMapTest {
7980

8081
private static final String NAMESPACE = "spring-k8s";
8182

82-
private static final boolean[] strategyCalled = new boolean[] { false };
83+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
8384

8485
private static CoreV1Api coreV1Api;
8586

@@ -140,15 +141,18 @@ void test(CapturedOutput output) {
140141
boolean two = output.getOut().contains("Failed to load source");
141142
boolean three = output.getOut()
142143
.contains("Reloadable condition was not satisfied, reload will not be triggered");
143-
boolean updateStrategyNotCalled = !strategyCalled[0];
144+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
145+
System.out.println("one: " + one + " two: " + two + " three: " + three + " updateStrategyNotCalled: " + updateStrategyNotCalled);
144146
return one && two && three && updateStrategyNotCalled;
145147
});
146148

149+
System.out.println("first assertion passed");
150+
147151
// it passes while reading 'configMapTwo'
148152
Awaitility.await()
149153
.atMost(Duration.ofSeconds(20))
150154
.pollInterval(Duration.ofSeconds(1))
151-
.until(() -> strategyCalled[0]);
155+
.until(STRATEGY_CALLED::get);
152156
}
153157

154158
private static V1ConfigMap configMap(String name, Map<String, String> data) {
@@ -216,7 +220,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
216220
@Primary
217221
ConfigurationUpdateStrategy configurationUpdateStrategy() {
218222
return new ConfigurationUpdateStrategy("to-console", () -> {
219-
strategyCalled[0] = true;
223+
STRATEGY_CALLED.set(true);
220224
});
221225
}
222226

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222
import java.util.Map;
2323
import java.util.Set;
24+
import java.util.concurrent.atomic.AtomicBoolean;
2425
import java.util.stream.Collectors;
2526

2627
import com.github.tomakehurst.wiremock.WireMockServer;
@@ -81,7 +82,7 @@ class PollingReloadSecretTest {
8182

8283
private static final String NAMESPACE = "spring-k8s";
8384

84-
private static final boolean[] strategyCalled = new boolean[] { false };
85+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
8586

8687
private static CoreV1Api coreV1Api;
8788

@@ -141,15 +142,15 @@ void test(CapturedOutput output) {
141142
boolean two = output.getOut().contains("Failed to load source");
142143
boolean three = output.getOut()
143144
.contains("Reloadable condition was not satisfied, reload will not be triggered");
144-
boolean updateStrategyNotCalled = !strategyCalled[0];
145+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
145146
return one && two && three && updateStrategyNotCalled;
146147
});
147148

148149
// it passes while reading 'secretTwo'
149150
Awaitility.await()
150151
.atMost(Duration.ofSeconds(20))
151152
.pollInterval(Duration.ofSeconds(1))
152-
.until(() -> strategyCalled[0]);
153+
.until(STRATEGY_CALLED::get);
153154
}
154155

155156
private static V1Secret secret(String name, Map<String, String> data) {
@@ -222,7 +223,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
222223
@Primary
223224
ConfigurationUpdateStrategy configurationUpdateStrategy() {
224225
return new ConfigurationUpdateStrategy("to-console", () -> {
225-
strategyCalled[0] = true;
226+
STRATEGY_CALLED.set(true);
226227
});
227228
}
228229

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/reload/ConfigReloadUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static boolean reload(PropertySourceLocator locator, ConfigurableEnvironm
7171

7272
boolean changed = changed(sourceFromK8s, existingSources);
7373
if (changed) {
74-
LOG.info("Detected change in config maps/secrets, reload will ne triggered");
74+
LOG.info("Detected change in config maps/secrets, reload will be triggered");
7575
return true;
7676
}
7777
else {

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadConfigMapTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.Set;
23+
import java.util.concurrent.atomic.AtomicBoolean;
2324

2425
import io.fabric8.kubernetes.api.model.ConfigMap;
2526
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
@@ -72,7 +73,7 @@ public class EventReloadConfigMapTest {
7273

7374
private static KubernetesClient kubernetesClient;
7475

75-
private static final boolean[] strategyCalled = new boolean[] { false };
76+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
7677

7778
@BeforeAll
7879
static void beforeAll() {
@@ -118,7 +119,7 @@ void test(CapturedOutput output) {
118119
boolean two = output.getOut().contains("Failed to load source");
119120
boolean three = output.getOut()
120121
.contains("Reloadable condition was not satisfied, reload will not be triggered");
121-
boolean updateStrategyNotCalled = !strategyCalled[0];
122+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
122123
return one && two && three && updateStrategyNotCalled;
123124
});
124125

@@ -132,7 +133,7 @@ void test(CapturedOutput output) {
132133
Awaitility.await()
133134
.atMost(Duration.ofSeconds(10))
134135
.pollInterval(Duration.ofSeconds(1))
135-
.until(() -> strategyCalled[0]);
136+
.until(STRATEGY_CALLED::get);
136137
}
137138

138139
private static ConfigMap configMap(String name, Map<String, String> data) {
@@ -197,7 +198,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
197198
@Primary
198199
ConfigurationUpdateStrategy configurationUpdateStrategy() {
199200
return new ConfigurationUpdateStrategy("to-console", () -> {
200-
strategyCalled[0] = true;
201+
STRATEGY_CALLED.set(true);
201202
});
202203
}
203204

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/EventReloadSecretTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222
import java.util.Map;
2323
import java.util.Set;
24+
import java.util.concurrent.atomic.AtomicBoolean;
2425
import java.util.stream.Collectors;
2526

2627
import io.fabric8.kubernetes.api.model.Secret;
@@ -75,7 +76,7 @@ class EventReloadSecretTest {
7576

7677
private static KubernetesClient kubernetesClient;
7778

78-
private static final boolean[] strategyCalled = new boolean[] { false };
79+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
7980

8081
@BeforeAll
8182
static void beforeAll() {
@@ -120,7 +121,7 @@ void test(CapturedOutput output) {
120121
boolean two = output.getOut().contains("Failed to load source");
121122
boolean three = output.getOut()
122123
.contains("Reloadable condition was not satisfied, reload will not be triggered");
123-
boolean updateStrategyNotCalled = !strategyCalled[0];
124+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
124125
return one && two && three && updateStrategyNotCalled;
125126
});
126127

@@ -134,7 +135,7 @@ void test(CapturedOutput output) {
134135
Awaitility.await()
135136
.atMost(Duration.ofSeconds(10))
136137
.pollInterval(Duration.ofSeconds(1))
137-
.until(() -> strategyCalled[0]);
138+
.until(STRATEGY_CALLED::get);
138139
}
139140

140141
private static Secret secret(String name, Map<String, String> data) {
@@ -204,7 +205,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
204205
@Primary
205206
ConfigurationUpdateStrategy configurationUpdateStrategy() {
206207
return new ConfigurationUpdateStrategy("to-console", () -> {
207-
strategyCalled[0] = true;
208+
STRATEGY_CALLED.set(true);
208209
});
209210
}
210211

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222
import java.util.Set;
23+
import java.util.concurrent.atomic.AtomicBoolean;
2324

2425
import io.fabric8.kubernetes.api.model.ConfigMap;
2526
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
@@ -73,7 +74,7 @@ class PollingReloadConfigMapTest {
7374

7475
private static KubernetesClient kubernetesClient;
7576

76-
private static final boolean[] strategyCalled = new boolean[] { false };
77+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
7778

7879
@BeforeAll
7980
static void beforeAll() {
@@ -113,15 +114,15 @@ void test(CapturedOutput output) {
113114
boolean two = output.getOut().contains("Failed to load source");
114115
boolean three = output.getOut()
115116
.contains("Reloadable condition was not satisfied, reload will not be triggered");
116-
boolean updateStrategyNotCalled = !strategyCalled[0];
117+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
117118
return one && two && three && updateStrategyNotCalled;
118119
});
119120

120121
// it passes while reading 'configMapTwo'
121122
Awaitility.await()
122123
.atMost(Duration.ofSeconds(20))
123124
.pollInterval(Duration.ofSeconds(1))
124-
.until(() -> strategyCalled[0]);
125+
.until(STRATEGY_CALLED::get);
125126
}
126127

127128
private static ConfigMap configMap(String name, Map<String, String> data) {
@@ -187,7 +188,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
187188
@Primary
188189
ConfigurationUpdateStrategy configurationUpdateStrategy() {
189190
return new ConfigurationUpdateStrategy("to-console", () -> {
190-
strategyCalled[0] = true;
191+
STRATEGY_CALLED.set(true);
191192
});
192193
}
193194

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.List;
2222
import java.util.Map;
2323
import java.util.Set;
24+
import java.util.concurrent.atomic.AtomicBoolean;
2425
import java.util.stream.Collectors;
2526

2627
import io.fabric8.kubernetes.api.model.Secret;
@@ -76,7 +77,7 @@ public class PollingReloadSecretTest {
7677

7778
private static KubernetesClient kubernetesClient;
7879

79-
private static final boolean[] strategyCalled = new boolean[] { false };
80+
private static final AtomicBoolean STRATEGY_CALLED = new AtomicBoolean(false);
8081

8182
@BeforeAll
8283
static void beforeAll() {
@@ -116,15 +117,15 @@ void test(CapturedOutput output) {
116117
boolean two = output.getOut().contains("Failed to load source");
117118
boolean three = output.getOut()
118119
.contains("Reloadable condition was not satisfied, reload will not be triggered");
119-
boolean updateStrategyNotCalled = !strategyCalled[0];
120+
boolean updateStrategyNotCalled = !STRATEGY_CALLED.get();
120121
return one && two && three && updateStrategyNotCalled;
121122
});
122123

123124
// it passes while reading 'secretTwo'
124125
Awaitility.await()
125126
.atMost(Duration.ofSeconds(20))
126127
.pollInterval(Duration.ofSeconds(1))
127-
.until(() -> strategyCalled[0]);
128+
.until(STRATEGY_CALLED::get);
128129
}
129130

130131
private static Secret secret(String name, Map<String, String> data) {
@@ -194,7 +195,7 @@ KubernetesNamespaceProvider namespaceProvider(AbstractEnvironment environment) {
194195
@Primary
195196
ConfigurationUpdateStrategy configurationUpdateStrategy() {
196197
return new ConfigurationUpdateStrategy("to-console", () -> {
197-
strategyCalled[0] = true;
198+
STRATEGY_CALLED.set(true);
198199
});
199200
}
200201

0 commit comments

Comments
 (0)