From 31492052c548c73ee4bba6e8e763a9f7a004f564 Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 6 Sep 2024 16:45:36 +0300 Subject: [PATCH] rename (#1712) --- ...ConfigServerAutoConfigurationKubernetesDisabledTests.java} | 2 +- ...bernetesEnabledProfileIncludedConfigApiDisabledTests.java} | 2 +- ...bernetesEnabledProfileIncludedConfigMapDisabledTests.java} | 2 +- ...ernetesEnabledProfileIncludedSecretsApiDisabledTests.java} | 2 +- ...bernetesEnabledProfileIncludedSecretsApiEnabledTests.java} | 2 +- ...toConfigurationKubernetesEnabledProfileIncludedTests.java} | 2 +- ...ServerAutoConfigurationKubernetesProfileMissingTests.java} | 2 +- ...onTest.java => BootstrapConfigServerIntegrationTests.java} | 2 +- ...nTest.java => ConfigDataConfigServerIntegrationTests.java} | 2 +- ...erverIntegrationTest.java => ConfigServerIntegration.java} | 2 +- ....java => DiscoveryServerIntegrationAppsEndpointTests.java} | 4 ++-- ...a => DiscoveryServerIntegrationAppsNameEndpointTests.java} | 4 ++-- ...a => DiscoveryServerIntegrationInstanceEndpointTests.java} | 4 ++-- .../{HeartbeatTest.java => HeartbeatTests.java} | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesDisabled.java => ConfigServerAutoConfigurationKubernetesDisabledTests.java} (95%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled.java => ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java} (98%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled.java => ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests.java} (98%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled.java => ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests.java} (98%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled.java => ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests.java} (98%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded.java => ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests.java} (99%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/{ConfigServerAutoConfigurationKubernetesProfileMissing.java => ConfigServerAutoConfigurationKubernetesProfileMissingTests.java} (95%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/{BootstrapConfigServerIntegrationTest.java => BootstrapConfigServerIntegrationTests.java} (93%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/{ConfigDataConfigServerIntegrationTest.java => ConfigDataConfigServerIntegrationTests.java} (96%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/{ConfigServerIntegrationTest.java => ConfigServerIntegration.java} (99%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/{DiscoveryServerIntegrationAppsEndpointTest.java => DiscoveryServerIntegrationAppsEndpointTests.java} (98%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/{DiscoveryServerIntegrationAppsNameEndpointTest.java => DiscoveryServerIntegrationAppsNameEndpointTests.java} (97%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/{DiscoveryServerIntegrationInstanceEndpointTest.java => DiscoveryServerIntegrationInstanceEndpointTests.java} (97%) rename spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/{HeartbeatTest.java => HeartbeatTests.java} (97%) diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabled.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabledTests.java similarity index 95% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabled.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabledTests.java index cedee516cd..84d69211e4 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabled.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesDisabledTests.java @@ -30,7 +30,7 @@ @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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java similarity index 98% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java index 249c7ccb8e..d800e06886 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabled.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java @@ -31,7 +31,7 @@ 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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests.java similarity index 98% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests.java index 2278cf732d..16e1241bfc 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabled.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigMapDisabledTests.java @@ -30,7 +30,7 @@ @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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests.java similarity index 98% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests.java index b8ab3ec300..89008bdff2 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabled.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiDisabledTests.java @@ -30,7 +30,7 @@ @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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests.java similarity index 98% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests.java index 9e3adf928f..d37eac4be8 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabled.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests.java @@ -31,7 +31,7 @@ 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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests.java similarity index 99% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests.java index 138bd39243..a553d5244c 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncluded.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedTests.java @@ -30,7 +30,7 @@ @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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissing.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissingTests.java similarity index 95% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissing.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissingTests.java index 3f9716aaf6..2d507599da 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissing.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesProfileMissingTests.java @@ -30,7 +30,7 @@ @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; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTests.java similarity index 93% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTests.java index 4892665cac..67a2250ff7 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTests.java @@ -27,6 +27,6 @@ "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 { } diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTests.java similarity index 96% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTests.java index ae3765ceae..5f6e81208b 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTests.java @@ -36,7 +36,7 @@ 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 clientUtilsMock; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegrationTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java similarity index 99% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegrationTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java index a3092e3a08..0ec76fce23 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegrationTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigServerIntegration.java @@ -41,7 +41,7 @@ /** * @author Ryan Baxter */ -abstract class ConfigServerIntegrationTest { +abstract class ConfigServerIntegration { @Autowired private TestRestTemplate testRestTemplate; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java similarity index 98% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java index 22109008cb..bb1a25c431 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsEndpointTests.java @@ -52,13 +52,13 @@ * @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"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java similarity index 97% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java index 59e0448327..a2229bc3b5 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationAppsNameEndpointTests.java @@ -52,13 +52,13 @@ * @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"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java similarity index 97% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java index ab71654b7d..b8290d8003 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java @@ -52,13 +52,13 @@ * @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"; diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTest.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java similarity index 97% rename from spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTest.java rename to spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java index 1c5bb99b71..25b3abcecc 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTest.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/HeartbeatTests.java @@ -38,7 +38,7 @@ /** * @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 @@ "management.health.readinessstate.enabled=true", "management.endpoint.health.group.readiness.include=readinessState" }) @AutoConfigureWebTestClient -class HeartbeatTest { +class HeartbeatTests { @Autowired private WebTestClient client;