Skip to content

Commit dde0a19

Browse files
ryanjbaxterryanjbaxter
authored
Merge pull request #2023 from wind57/replace_mock_and_spy_bean
replace @MockBean and @SpyBean
2 parents 9432ef8 + d4c997d commit dde0a19

File tree

9 files changed

+40
-24
lines changed

9 files changed

+40
-24
lines changed

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.junit.jupiter.api.Test;
2424

2525
import org.springframework.boot.test.context.SpringBootTest;
26-
import org.springframework.boot.test.mock.mockito.SpyBean;
2726
import org.springframework.boot.test.web.server.LocalServerPort;
2827
import org.springframework.cloud.config.environment.Environment;
2928
import org.springframework.cloud.config.environment.PropertySource;
@@ -33,6 +32,7 @@
3332
import org.springframework.http.HttpMethod;
3433
import org.springframework.http.ResponseEntity;
3534
import org.springframework.test.context.ActiveProfiles;
35+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
3636
import org.springframework.web.client.RestTemplate;
3737

3838
import static org.assertj.core.api.Assertions.assertThat;
@@ -92,7 +92,7 @@ class KubernetesSecretsEnabledCompositeConfigServerTest {
9292
@LocalServerPort
9393
private int port;
9494

95-
@SpyBean
95+
@MockitoSpyBean
9696
private NativeEnvironmentRepository nativeEnvironmentRepository;
9797

9898
@Test
@@ -132,7 +132,7 @@ class KubernetesConfigMapDisabledCompositeConfigServerTest {
132132
@LocalServerPort
133133
private int port;
134134

135-
@SpyBean
135+
@MockitoSpyBean
136136
private NativeEnvironmentRepository nativeEnvironmentRepository;
137137

138138
@Test
@@ -170,7 +170,7 @@ class KubernetesSecretsDisabledCompositeConfigServerTest {
170170
@LocalServerPort
171171
private int port;
172172

173-
@SpyBean
173+
@MockitoSpyBean
174174
private NativeEnvironmentRepository nativeEnvironmentRepository;
175175

176176
@Test
@@ -209,7 +209,7 @@ class NativeAndKubernetesConfigServerTest {
209209
@LocalServerPort
210210
private int port;
211211

212-
@SpyBean
212+
@MockitoSpyBean
213213
private NativeEnvironmentRepository nativeEnvironmentRepository;
214214

215215
@Test

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/BoostrapConfigRetryEnabledTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
2424

25-
import org.springframework.boot.test.mock.mockito.SpyBean;
2625
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySourceLocator;
2726
import org.springframework.test.context.TestPropertySource;
27+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
2828

2929
/**
3030
* @author Isik Erhan
@@ -42,7 +42,7 @@ static void setup() {
4242
setup(mockClient, mockServer);
4343
}
4444

45-
@SpyBean
45+
@MockitoSpyBean
4646
Fabric8ConfigMapPropertySourceLocator propertySourceLocator;
4747

4848
@BeforeEach

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabledTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import org.mockito.internal.util.MockUtil;
2727

2828
import org.springframework.beans.factory.annotation.Autowired;
29-
import org.springframework.boot.test.mock.mockito.MockBean;
3029
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
3130
import org.springframework.cloud.kubernetes.commons.config.ConfigDataRetryableConfigMapPropertySourceLocator;
3231
import org.springframework.test.context.TestPropertySource;
32+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3333

3434
import static org.mockito.Mockito.spy;
3535

@@ -45,7 +45,7 @@ class ConfigDataConfigRetryEnabledTests extends ConfigRetryEnabled {
4545

4646
private static KubernetesClient mockClient;
4747

48-
@MockBean
48+
@MockitoBean
4949
private KubernetesNamespaceProvider namespaceProvider;
5050

5151
@BeforeAll

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
2525
import org.junit.jupiter.api.BeforeAll;
2626

27-
import org.springframework.boot.test.mock.mockito.MockBean;
2827
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
2928
import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
3029
import org.springframework.cloud.kubernetes.commons.config.RetryProperties;
@@ -33,6 +32,7 @@
3332
import org.springframework.context.annotation.Import;
3433
import org.springframework.core.env.Environment;
3534
import org.springframework.test.context.TestPropertySource;
35+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3636

3737
/**
3838
* we call Fabric8ConfigMapPropertySourceLocator::locate directly, thus no need for
@@ -53,7 +53,7 @@ class ConfigDataConfigFailFastEnabledButRetryDisabledTests extends ConfigFailFas
5353

5454
private static KubernetesClient mockClient;
5555

56-
@MockBean
56+
@MockitoBean
5757
private KubernetesNamespaceProvider kubernetesNamespaceProvider;
5858

5959
@BeforeAll
@@ -66,8 +66,8 @@ static class LocalConfig {
6666

6767
/**
6868
* we need this config because ConfigMapConfigProperties is now a record, so we
69-
* can't use @SpyBean on it. We also read the property of fail-fast from the
70-
* Environment, that in turn is set in the @SpringBootTest properties.
69+
* can't use @MockitoSpyBean on it. We also read the property of fail-fast from
70+
* the Environment, that in turn is set in the @SpringBootTest properties.
7171
*/
7272
@Bean
7373
ConfigMapConfigProperties properties(Environment environment) {

‎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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@
2323

2424
import org.springframework.beans.factory.annotation.Autowired;
2525
import org.springframework.boot.test.context.SpringBootTest;
26-
import org.springframework.boot.test.mock.mockito.SpyBean;
26+
import org.springframework.boot.test.context.TestConfiguration;
27+
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
28+
import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
2729
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8ConfigMapPropertySourceLocator;
2830
import org.springframework.cloud.kubernetes.fabric8.config.TestApplication;
31+
import org.springframework.cloud.kubernetes.fabric8.config.VisibleFabric8ConfigMapPropertySourceLocator;
2932
import org.springframework.context.ApplicationContext;
33+
import org.springframework.context.annotation.Bean;
3034
import org.springframework.mock.env.MockEnvironment;
35+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
3136

3237
import static org.assertj.core.api.Assertions.assertThat;
3338
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -49,7 +54,7 @@
4954
"spring.cloud.kubernetes.config.fail-fast=true", "spring.cloud.kubernetes.config.retry.enabled=false",
5055
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.config.enabled=false",
5156
"spring.cloud.kubernetes.secrets.enabled=false" },
52-
classes = TestApplication.class)
57+
classes = { TestApplication.class, ConfigFailFastEnabledButRetryDisabled.ConfigForTest.class })
5358
abstract class ConfigFailFastEnabledButRetryDisabled {
5459

5560
private static final String API = "/api/v1/namespaces/default/configmaps/application";
@@ -69,7 +74,7 @@ static void setup(KubernetesClient mockClient, KubernetesMockServer mockServer)
6974
System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
7075
}
7176

72-
@SpyBean
77+
@MockitoSpyBean
7378
private Fabric8ConfigMapPropertySourceLocator propertySourceLocator;
7479

7580
@Autowired
@@ -89,4 +94,15 @@ void locateShouldFailWithoutRetrying() {
8994
verify(propertySourceLocator, times(1)).locate(any());
9095
}
9196

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

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/BootstrapSecretsRetryEnabledTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
2424

25-
import org.springframework.boot.test.mock.mockito.SpyBean;
2625
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
2726
import org.springframework.test.context.TestPropertySource;
27+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
2828

2929
@TestPropertySource(properties = "spring.cloud.bootstrap.enabled=true")
3030
@EnableKubernetesMockClient
@@ -39,7 +39,7 @@ static void setup() {
3939
setup(mockClient, mockServer);
4040
}
4141

42-
@SpyBean
42+
@MockitoSpyBean
4343
private Fabric8SecretsPropertySourceLocator propertySourceLocator;
4444

4545
@BeforeEach

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_disabled/BootstrapSecretsFailFastDisabledTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
2424

25-
import org.springframework.boot.test.mock.mockito.SpyBean;
2625
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
2726
import org.springframework.test.context.TestPropertySource;
27+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
2828

2929
@TestPropertySource(properties = { "spring.cloud.bootstrap.enabled=true" })
3030
@EnableKubernetesMockClient
@@ -39,7 +39,7 @@ static void setup() {
3939
setup(mockClient, mockServer);
4040
}
4141

42-
@SpyBean
42+
@MockitoSpyBean
4343
private Fabric8SecretsPropertySourceLocator propertySourceLocator;
4444

4545
@BeforeEach

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_fail_fast_enabled_retry_disabled/BootstrapSecretsFailFastEnabledButRetryDisabledTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
2424

25-
import org.springframework.boot.test.mock.mockito.SpyBean;
2625
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
2726
import org.springframework.test.context.TestPropertySource;
27+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
2828

2929
/**
3030
* @author Isik Erhan
@@ -42,7 +42,7 @@ static void setup() {
4242
setup(mockClient, mockServer);
4343
}
4444

45-
@SpyBean
45+
@MockitoSpyBean
4646
private Fabric8SecretsPropertySourceLocator propertySourceLocator;
4747

4848
@BeforeEach

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_retry_disabled_config_enabled/BootstrapSecretsRetryDisabledButConfigRetryEnabledTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.junit.jupiter.api.BeforeAll;
2323
import org.junit.jupiter.api.BeforeEach;
2424

25-
import org.springframework.boot.test.mock.mockito.SpyBean;
2625
import org.springframework.cloud.kubernetes.fabric8.config.Fabric8SecretsPropertySourceLocator;
2726
import org.springframework.context.ApplicationContext;
2827
import org.springframework.test.context.TestPropertySource;
28+
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
3131

@@ -45,7 +45,7 @@ static void setup() {
4545
setup(mockClient, mockServer);
4646
}
4747

48-
@SpyBean
48+
@MockitoSpyBean
4949
private Fabric8SecretsPropertySourceLocator propertySourceLocator;
5050

5151
@BeforeEach

0 commit comments

Comments
 (0)