Skip to content

Commit 941d6d7

Browse files
wind57wind57
committed
wip
Signed-off-by: wind57 <[email protected]>
1 parent 03458e1 commit 941d6d7

File tree

3 files changed

+47
-174
lines changed

3 files changed

+47
-174
lines changed

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientInformerDiscoveryClientAutoConfigurationApplicationContextTests.java‎

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@
3838
import org.springframework.context.annotation.Primary;
3939

4040
import static org.assertj.core.api.Assertions.assertThat;
41-
import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertNonSelectiveNamespacesBeansMissing;
42-
import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertNonSelectiveNamespacesBeansPresent;
43-
import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertSelectiveNamespacesBeansMissing;
44-
import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertSelectiveNamespacesBeansPresent;
41+
import static org.springframework.cloud.kubernetes.client.discovery.TestUtils.assertInformerBeansPresent;
4542

4643
/**
4744
* Test various conditionals for
@@ -70,8 +67,7 @@ void discoveryEnabledDefault() {
7067
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
7168
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
7269

73-
assertNonSelectiveNamespacesBeansPresent(context);
74-
assertSelectiveNamespacesBeansMissing(context);
70+
assertInformerBeansPresent(context, 2);
7571
});
7672
}
7773

@@ -86,8 +82,8 @@ void discoveryEnabledDefaultWithSelectiveNamespaces() {
8682
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
8783
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
8884

89-
assertNonSelectiveNamespacesBeansMissing(context);
90-
assertSelectiveNamespacesBeansPresent(context, 3);
85+
// 3 namespaces
86+
assertInformerBeansPresent(context, 3);
9187
});
9288
}
9389

@@ -102,8 +98,7 @@ void discoveryEnabled() {
10298
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
10399
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
104100

105-
assertNonSelectiveNamespacesBeansPresent(context);
106-
assertSelectiveNamespacesBeansMissing(context);
101+
assertInformerBeansPresent(context, 2);
107102
});
108103
}
109104

@@ -118,8 +113,7 @@ void discoveryEnabledWithSelectiveNamespaces() {
118113
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
119114
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
120115

121-
assertNonSelectiveNamespacesBeansMissing(context);
122-
assertSelectiveNamespacesBeansPresent(context, 2);
116+
assertInformerBeansPresent(context, 2);
123117
});
124118
}
125119

@@ -134,8 +128,7 @@ void discoveryDisabled() {
134128
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
135129
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
136130

137-
assertNonSelectiveNamespacesBeansMissing(context);
138-
assertSelectiveNamespacesBeansMissing(context);
131+
assertInformerBeansPresent(context, 2);
139132
});
140133
}
141134

@@ -150,8 +143,7 @@ void discoveryDisabledWithSelectiveNamespaces() {
150143
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
151144
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
152145

153-
assertNonSelectiveNamespacesBeansMissing(context);
154-
assertSelectiveNamespacesBeansMissing(context);
146+
assertInformerBeansPresent(context , 2);
155147
});
156148
}
157149

@@ -166,8 +158,7 @@ void kubernetesDiscoveryEnabled() {
166158
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
167159
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
168160

169-
assertNonSelectiveNamespacesBeansPresent(context);
170-
assertSelectiveNamespacesBeansMissing(context);
161+
assertInformerBeansPresent(context, 2);
171162
});
172163
}
173164

@@ -183,8 +174,7 @@ void kubernetesDiscoveryEnabledWithSelectiveNamespaces() {
183174
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
184175
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
185176

186-
assertNonSelectiveNamespacesBeansMissing(context);
187-
assertSelectiveNamespacesBeansPresent(context, 4);
177+
assertInformerBeansPresent(context, 4);
188178
});
189179
}
190180

@@ -199,8 +189,7 @@ void kubernetesDiscoveryDisabled() {
199189
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
200190
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
201191

202-
assertNonSelectiveNamespacesBeansMissing(context);
203-
assertSelectiveNamespacesBeansMissing(context);
192+
assertInformerBeansPresent(context , 2);
204193
});
205194
}
206195

@@ -216,8 +205,7 @@ void kubernetesDiscoveryDisabledWithSelectiveNamespaces() {
216205
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
217206
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
218207

219-
assertNonSelectiveNamespacesBeansMissing(context);
220-
assertSelectiveNamespacesBeansMissing(context);
208+
assertInformerBeansPresent(context , 4);
221209
});
222210
}
223211

@@ -232,8 +220,7 @@ void kubernetesDiscoveryBlockingEnabled() {
232220
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
233221
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
234222

235-
assertNonSelectiveNamespacesBeansPresent(context);
236-
assertSelectiveNamespacesBeansMissing(context);
223+
assertInformerBeansPresent(context , 2);
237224
});
238225
}
239226

@@ -248,8 +235,7 @@ void kubernetesDiscoveryBlockingEnabledWithSelectiveNamespaces() {
248235
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
249236
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
250237

251-
assertNonSelectiveNamespacesBeansMissing(context);
252-
assertSelectiveNamespacesBeansPresent(context, 1);
238+
assertInformerBeansPresent(context, 2);
253239
});
254240
}
255241

@@ -264,8 +250,7 @@ void kubernetesDiscoveryBlockingDisabled() {
264250
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
265251
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
266252

267-
assertNonSelectiveNamespacesBeansPresent(context);
268-
assertSelectiveNamespacesBeansMissing(context);
253+
assertInformerBeansPresent(context , 2);
269254
});
270255
}
271256

@@ -280,8 +265,7 @@ void kubernetesDiscoveryBlockingDisabledWithSelectiveNamespaces() {
280265
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
281266
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
282267

283-
assertNonSelectiveNamespacesBeansMissing(context);
284-
assertSelectiveNamespacesBeansPresent(context, 2);
268+
assertInformerBeansPresent(context, 2);
285269
});
286270
}
287271

@@ -296,8 +280,7 @@ void kubernetesDiscoveryHealthIndicatorEnabled() {
296280
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
297281
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
298282

299-
assertNonSelectiveNamespacesBeansPresent(context);
300-
assertSelectiveNamespacesBeansMissing(context);
283+
assertInformerBeansPresent(context , 2);
301284
});
302285
}
303286

@@ -313,8 +296,7 @@ void kubernetesDiscoveryHealthIndicatorEnabledWithSelectiveNamespaces() {
313296
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
314297
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
315298

316-
assertNonSelectiveNamespacesBeansMissing(context);
317-
assertSelectiveNamespacesBeansPresent(context, 1);
299+
assertInformerBeansPresent(context, 2);
318300
});
319301
}
320302

@@ -329,8 +311,7 @@ void kubernetesDiscoveryHealthIndicatorDisabled() {
329311
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
330312
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
331313

332-
assertNonSelectiveNamespacesBeansPresent(context);
333-
assertSelectiveNamespacesBeansMissing(context);
314+
assertInformerBeansPresent(context , 2);
334315
});
335316
}
336317

@@ -346,8 +327,7 @@ void kubernetesDiscoveryHealthIndicatorDisabledWithSelectiveNamespaces() {
346327
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
347328
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
348329

349-
assertNonSelectiveNamespacesBeansMissing(context);
350-
assertSelectiveNamespacesBeansPresent(context, 1);
330+
assertInformerBeansPresent(context, 2);
351331
});
352332
}
353333

@@ -362,8 +342,7 @@ void kubernetesDiscoveryHealthIndicatorEnabledHealthIndicatorMissing() {
362342
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
363343
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
364344

365-
assertNonSelectiveNamespacesBeansPresent(context);
366-
assertSelectiveNamespacesBeansMissing(context);
345+
assertInformerBeansPresent(context , 2);
367346
});
368347
}
369348

@@ -379,8 +358,7 @@ void kubernetesDiscoveryHealthIndicatorEnabledHealthIndicatorMissingWithSelectiv
379358
assertThat(context).doesNotHaveBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
380359
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
381360

382-
assertNonSelectiveNamespacesBeansMissing(context);
383-
assertSelectiveNamespacesBeansPresent(context, 5);
361+
assertInformerBeansPresent(context, 5);
384362
});
385363
}
386364

@@ -398,8 +376,7 @@ void reactiveDisabled() {
398376
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
399377
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
400378

401-
assertNonSelectiveNamespacesBeansPresent(context);
402-
assertSelectiveNamespacesBeansMissing(context);
379+
assertInformerBeansPresent(context , 2);
403380
});
404381
}
405382

@@ -418,8 +395,7 @@ void reactiveDisabledWithSelectiveNamespaces() {
418395
assertThat(context).hasSingleBean(KubernetesDiscoveryClientHealthIndicatorInitializer.class);
419396
assertThat(context).doesNotHaveBean(ReactiveDiscoveryClientHealthIndicator.class);
420397

421-
assertNonSelectiveNamespacesBeansMissing(context);
422-
assertSelectiveNamespacesBeansPresent(context, 5);
398+
assertInformerBeansPresent(context, 5);
423399
});
424400
}
425401

0 commit comments

Comments
 (0)