Skip to content

Commit a611d30

Browse files
committed
fix test
Signed-off-by: wind57 <[email protected]>
1 parent 5d65ffb commit a611d30

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/fail_fast_enabled_retry_disabled/ConfigFailFastEnabledButRetryDisabled.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,19 @@
2121
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
2222
import org.junit.jupiter.api.Test;
2323

24+
import org.mockito.Mockito;
2425
import org.springframework.beans.factory.annotation.Autowired;
2526
import org.springframework.boot.test.context.SpringBootTest;
27+
import org.springframework.boot.test.context.TestConfiguration;
28+
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
29+
import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
2630
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySourceLocator;
2731
import org.springframework.cloud.kubernetes.fabric8.config.TestApplication;
32+
import org.springframework.cloud.kubernetes.fabric8.config.VisibleFabric8ConfigMapPropertySourceLocator;
2833
import org.springframework.context.ApplicationContext;
34+
import org.springframework.context.annotation.Bean;
2935
import org.springframework.mock.env.MockEnvironment;
36+
import org.springframework.test.context.bean.override.mockito.MockReset;
3037
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
3138

3239
import static org.assertj.core.api.Assertions.assertThat;
@@ -49,7 +56,7 @@
4956
"spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.config.retry.enabled=false",
5057
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.config.enabled=false",
5158
"spring.cloud.kubernetes.secrets.enabled=false" },
52-
classes = TestApplication.class)
59+
classes = { TestApplication.class, ConfigFailFastEnabledButRetryDisabled.ConfigForTest.class })
5360
abstract class ConfigFailFastEnabledButRetryDisabled {
5461

5562
private static final String API = "/api/v1/namespaces/default/configmaps/application";
@@ -89,4 +96,15 @@ void locateShouldFailWithoutRetrying() {
8996
verify(propertySourceLocator, times(1)).locate(any());
9097
}
9198

99+
@TestConfiguration
100+
static class ConfigForTest {
101+
102+
@Bean
103+
Fabric8ConfigMapPropertySourceLocator propertySourceLocator(KubernetesClient client,
104+
ConfigMapConfigProperties properties, KubernetesNamespaceProvider provider) {
105+
return new VisibleFabric8ConfigMapPropertySourceLocator(client, properties, provider);
106+
}
107+
108+
}
109+
92110
}

0 commit comments

Comments
 (0)