SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

style checked for config module

Browse Source
This commit is contained in:
Haytham Mohamed
2020-12-01 15:51:47 -06:00
parent 6572142a21
commit 65d5e96da9
2 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/KubernetesConfigTestBase.java
View File

@@ -20,6 +20,7 @@ import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
import org.junit.After;
import org.junit.ClassRule;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -34,22 +35,15 @@ import org.springframework.context.annotation.Configuration;
**/
public class KubernetesConfigTestBase {
private static ConfigurableApplicationContext context;
@ClassRule
public static KubernetesServer server = new KubernetesServer();
private static ConfigurableApplicationContext context;
protected static ConfigurableApplicationContext getContext() {
return context;
}
@After
public void close() {
if (this.context != null) {
this.context.close();
}
}
protected static void setup(String... env) {
context = new SpringApplicationBuilder(PropertyPlaceholderAutoConfiguration.class,
KubernetesClientTestConfiguration.class, BootstrapConfiguration.class,
@@ -58,6 +52,13 @@ public class KubernetesConfigTestBase {
.properties(env).run();
}
@After
public void close() {
if (this.context != null) {
this.context.close();
}
}
@Configuration(proxyBeanMethods = false)
private static class KubernetesClientTestConfiguration {

65
spring-cloud-kubernetes-config/src/test/java/org/springframework/cloud/kubernetes/config/reload/ConfigReloadAutoConfigurationTest.java
View File

@@ -16,16 +16,17 @@
package org.springframework.cloud.kubernetes.config.reload;
import java.util.HashMap;
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.cloud.kubernetes.config.KubernetesConfigTestBase;
import java.util.HashMap;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Haytham Mohamed
@@ -38,6 +39,35 @@ public class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase
private static final String APPLICATION_NAME = "application";
@BeforeClass
public static void setUpBeforeClass() {
setup();
KubernetesClient mockClient = getContext().getBean(KubernetesClient.class);
// Configure the kubernetes master url to point to the mock server
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
mockClient.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY,
"false");
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
HashMap<String, String> data = new HashMap<>();
data.put("bean.greeting", "Hello ConfigMap, %s!");
server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata()
.withName(APPLICATION_NAME).endMetadata().addToData(data).build())
.always();
server.expect()
.withPath("/api/v1/namespaces/spring/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata()
.withName(APPLICATION_NAME).endMetadata().addToData(data).build())
.always();
}
@Test
public void kubernetesConfigReloadDisabled() throws Exception {
setup("spring.cloud.kubernetes.reload.enabled=false");
@@ -104,33 +134,4 @@ public class ConfigReloadAutoConfigurationTest extends KubernetesConfigTestBase
assertThat(this.getContext().containsBean("propertyChangeWatcher")).isFalse();
}
@BeforeClass
public static void setUpBeforeClass() {
setup();
KubernetesClient mockClient = getContext().getBean(KubernetesClient.class);
// Configure the kubernetes master url to point to the mock server
System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
mockClient.getConfiguration().getMasterUrl());
System.setProperty(Config.KUBERNETES_TRUST_CERT_SYSTEM_PROPERTY, "true");
System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
System.setProperty(Config.KUBERNETES_AUTH_TRYSERVICEACCOUNT_SYSTEM_PROPERTY,
"false");
System.setProperty(Config.KUBERNETES_NAMESPACE_SYSTEM_PROPERTY, "test");
System.setProperty(Config.KUBERNETES_HTTP2_DISABLE, "true");
HashMap<String, String> data = new HashMap<>();
data.put("bean.greeting", "Hello ConfigMap, %s!");
server.expect().withPath("/api/v1/namespaces/test/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata()
.withName(APPLICATION_NAME).endMetadata().addToData(data).build())
.always();
server.expect()
.withPath("/api/v1/namespaces/spring/configmaps/" + APPLICATION_NAME)
.andReturn(200, new ConfigMapBuilder().withNewMetadata()
.withName(APPLICATION_NAME).endMetadata().addToData(data).build())
.always();
}
}