This commit is contained in:
erabii
2024-09-06 16:45:36 +03:00
committed by GitHub
parent e3368dbb4f
commit 31492052c5
14 changed files with 18 additions and 18 deletions

View File

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
properties = { "spring.profiles.include=kubernetes,kubernetesdisabled" },
classes = { KubernetesConfigServerApplication.class, MockConfig.class })
class ConfigServerAutoConfigurationKubernetesDisabled {
class ConfigServerAutoConfigurationKubernetesDisabledTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
classes = { KubernetesConfigServerApplication.class },
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.profiles.include=kubernetes",
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.enableApi=false" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.config.enabled=false" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.client.namespace=default" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
classes = { KubernetesConfigServerApplication.class },
properties = { "spring.profiles.include=kubernetes", "spring.main.cloud-platform=KUBERNETES",
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.enableApi=true" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class }, properties = { "spring.main.cloud-platform=KUBERNETES",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.client.namespace=default" })
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded {
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = { KubernetesConfigServerApplication.class, MockConfig.class },
properties = { "spring.profiles.include=kubernetes,kubernetesdisabled" })
class ConfigServerAutoConfigurationKubernetesProfileMissing {
class ConfigServerAutoConfigurationKubernetesProfileMissingTests {
@Autowired
private ConfigurableApplicationContext context;

View File

@@ -27,6 +27,6 @@ import org.springframework.cloud.kubernetes.configserver.KubernetesConfigServerA
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true",
"spring.cloud.bootstrap.enabled=true" },
classes = { KubernetesConfigServerApplication.class })
class BootstrapConfigServerIntegrationTest extends ConfigServerIntegrationTest {
class BootstrapConfigServerIntegrationTests extends ConfigServerIntegration {
}

View File

@@ -36,7 +36,7 @@ import static org.mockito.Mockito.mockStatic;
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true" },
classes = { KubernetesConfigServerApplication.class, TestBootstrapConfig.class })
class ConfigDataConfigServerIntegrationTest extends ConfigServerIntegrationTest {
class ConfigDataConfigServerIntegrationTests extends ConfigServerIntegration {
private MockedStatic<KubernetesClientUtils> clientUtilsMock;

View File

@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Ryan Baxter
*/
abstract class ConfigServerIntegrationTest {
abstract class ConfigServerIntegration {
@Autowired
private TestRestTemplate testRestTemplate;

View File

@@ -52,13 +52,13 @@ import static org.mockito.Mockito.when;
* @author wind57
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DiscoveryServerIntegrationAppsEndpointTest.TestConfig.class,
classes = DiscoveryServerIntegrationAppsEndpointTests.TestConfig.class,
properties = { "management.health.livenessstate.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
class DiscoveryServerIntegrationAppsEndpointTest {
class DiscoveryServerIntegrationAppsEndpointTests {
private static final String NAMESPACE = "namespace";

View File

@@ -52,13 +52,13 @@ import static org.mockito.Mockito.when;
* @author wind57
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DiscoveryServerIntegrationAppsNameEndpointTest.TestConfig.class,
classes = DiscoveryServerIntegrationAppsNameEndpointTests.TestConfig.class,
properties = { "management.health.livenessstate.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
class DiscoveryServerIntegrationAppsNameEndpointTest {
class DiscoveryServerIntegrationAppsNameEndpointTests {
private static final String NAMESPACE = "namespace";

View File

@@ -52,13 +52,13 @@ import static org.mockito.Mockito.when;
* @author wind57
*/
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DiscoveryServerIntegrationInstanceEndpointTest.TestConfig.class,
classes = DiscoveryServerIntegrationInstanceEndpointTests.TestConfig.class,
properties = { "management.health.livenessstate.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.endpoint.health.group.liveness.include=livenessState",
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
class DiscoveryServerIntegrationInstanceEndpointTest {
class DiscoveryServerIntegrationInstanceEndpointTests {
private static final String NAMESPACE = "namespace";

View File

@@ -38,7 +38,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
/**
* @author wind57
*/
@SpringBootTest(classes = HeartbeatTest.TestConfig.class,
@SpringBootTest(classes = HeartbeatTests.TestConfig.class,
properties = { "spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true",
/* disable kubernetes from liveness and readiness */
"management.health.livenessstate.enabled=true",
@@ -46,7 +46,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
"management.health.readinessstate.enabled=true",
"management.endpoint.health.group.readiness.include=readinessState" })
@AutoConfigureWebTestClient
class HeartbeatTest {
class HeartbeatTests {
@Autowired
private WebTestClient client;