Repository: camel Updated Branches: refs/heads/master 9f16d3790 -> 3cf7e33b9
CAMEL-11356: Camel-Kubernetes: refactoring tests by using Kubernetes-server-mock and Openshift-server-mock - Namespaces tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b95ec61 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b95ec61 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b95ec61 Branch: refs/heads/master Commit: 1b95ec611de1a690db33d67873d3712a6fb158ae Parents: 2cf8921 Author: Andrea Cosentino <[email protected]> Authored: Mon May 29 15:57:53 2017 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Tue May 30 11:01:10 2017 +0200 ---------------------------------------------------------------------- ...recatedKubernetesNamespacesProducerTest.java | 2 + .../KubernetesNamespacesProducerTest.java | 168 ++++--------------- 2 files changed, 33 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1b95ec61/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesNamespacesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesNamespacesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesNamespacesProducerTest.java index bbef5ee..5df0bfb 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesNamespacesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesNamespacesProducerTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.kubernetes.deprecated; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.kubernetes.producer.KubernetesNamespacesProducerTest; +import org.junit.Ignore; +@Ignore @Deprecated public class DeprecatedKubernetesNamespacesProducerTest extends KubernetesNamespacesProducerTest { http://git-wip-us.apache.org/repos/asf/camel/blob/1b95ec61/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java index 4c2145f..3ce34bd 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNamespacesProducerTest.java @@ -16,165 +16,71 @@ */ package org.apache.camel.component.kubernetes.producer; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; import io.fabric8.kubernetes.api.model.Namespace; +import io.fabric8.kubernetes.api.model.NamespaceBuilder; +import io.fabric8.kubernetes.api.model.NamespaceListBuilder; +import io.fabric8.kubernetes.api.model.ObjectMeta; +import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.apache.camel.util.ObjectHelper; +import org.apache.camel.impl.JndiRegistry; +import org.junit.Rule; import org.junit.Test; public class KubernetesNamespacesProducerTest extends KubernetesTestSupport { + @Rule + public KubernetesServer server = new KubernetesServer(); + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry registry = super.createRegistry(); + registry.bind("kubernetesClient", server.getClient()); + return registry; + } + @Test public void listTest() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } - List<Namespace> result = template.requestBody("direct:list", "", - List.class); - - boolean defaultExists = false; - - Iterator<Namespace> it = result.iterator(); - while (it.hasNext()) { - Namespace namespace = it.next(); - if ("default".equalsIgnoreCase(namespace.getMetadata().getName())) { - defaultExists = true; - } - } - - assertTrue(defaultExists); + server.expect().withPath("/api/v1/namespaces").andReturn(200, new NamespaceListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once(); + List<Namespace> result = template.requestBody("direct:list", "", List.class); + assertEquals(3, result.size()); } @Test public void getNamespace() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } + ObjectMeta meta = new ObjectMeta(); + meta.setName("test"); + server.expect().withPath("/api/v1/namespaces/test").andReturn(200, new NamespaceBuilder().withMetadata(meta).build()).once(); Exchange ex = template.request("direct:getNs", new Processor() { @Override public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "default"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test"); } }); Namespace ns = ex.getOut().getBody(Namespace.class); - assertEquals(ns.getMetadata().getName(), "default"); - - } - - @Test - public void createAndDeleteNamespace() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } - Exchange ex = template.request("direct:createNamespace", - new Processor() { - - @Override - public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "test"); - Map<String, String> labels = new HashMap<String, String>(); - labels.put("this", "rocks"); - exchange.getIn() - .setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, - labels); - } - }); - - Namespace ns = ex.getOut().getBody(Namespace.class); - assertEquals(ns.getMetadata().getName(), "test"); - - ex = template.request("direct:deleteNamespace", new Processor() { - - @Override - public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test"); - } - }); - - boolean nsDeleted = ex.getOut().getBody(Boolean.class); - - assertTrue(nsDeleted); } @Test - public void createListByLabelsAndDeleteNamespace() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } - Exchange ex = template.request("direct:createNamespace", - new Processor() { - - @Override - public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "test"); - Map<String, String> labels = new HashMap<String, String>(); - labels.put("this", "rocks"); - exchange.getIn() - .setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, - labels); - } - }); - - Namespace ns = ex.getOut().getBody(Namespace.class); - - assertEquals(ns.getMetadata().getName(), "test"); - - ex = template.request("direct:listByLabels", new Processor() { - - @Override - public void process(Exchange exchange) throws Exception { - Map<String, String> labels = new HashMap<String, String>(); - labels.put("this", "rocks"); - exchange.getIn() - .setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_LABELS, - labels); - } - }); - - List<Namespace> result = ex.getOut().getBody(List.class); - - boolean testExists = false; - - Iterator<Namespace> it = result.iterator(); - while (it.hasNext()) { - Namespace namespace = it.next(); - if ("test".equalsIgnoreCase(namespace.getMetadata().getName())) { - testExists = true; - } - } - - assertTrue(testExists); + public void createAndDeleteNamespace() throws Exception { + Namespace ns1 = new NamespaceBuilder().withNewMetadata().withName("ns1").endMetadata().build(); + server.expect().withPath("/api/v1/namespaces/ns1").andReturn(200, ns1).once(); - ex = template.request("direct:deleteNamespace", new Processor() { + Exchange ex = template.request("direct:deleteNamespace", new Processor() { @Override public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "ns1"); } }); @@ -188,21 +94,9 @@ public class KubernetesNamespacesProducerTest extends KubernetesTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:list") - .toF("kubernetes-namespaces://%s?oauthToken=%s&operation=listNamespaces", - host, authToken); - from("direct:listByLabels") - .toF("kubernetes-namespaces://%s?oauthToken=%s&operation=listNamespacesByLabels", - host, authToken); - from("direct:getNs") - .toF("kubernetes-namespaces://%s?oauthToken=%s&operation=getNamespace", - host, authToken); - from("direct:createNamespace") - .toF("kubernetes-namespaces://%s?oauthToken=%s&operation=createNamespace", - host, authToken); - from("direct:deleteNamespace") - .toF("kubernetes-namespaces://%s?oauthToken=%s&operation=deleteNamespace", - host, authToken); + from("direct:list").to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=listNamespaces"); + from("direct:getNs").to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=getNamespace"); + from("direct:deleteNamespace").to("kubernetes-namespaces:///?kubernetesClient=#kubernetesClient&operation=deleteNamespace"); } }; }
