CAMEL-11356: Camel-Kubernetes: refactoring tests by using Kubernetes-server-mock and Openshift-server-mock - PersistentVolumes tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d5f98dc4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d5f98dc4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d5f98dc4 Branch: refs/heads/master Commit: d5f98dc4d5b007294866905333f4b36a6f3605da Parents: c0923bb Author: Andrea Cosentino <[email protected]> Authored: Tue May 30 08:28:35 2017 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Tue May 30 11:01:11 2017 +0200 ---------------------------------------------------------------------- ...KubernetesPersistentVolumesProducerTest.java | 2 + ...KubernetesPersistentVolumesProducerTest.java | 51 +++++++++++--------- 2 files changed, 29 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d5f98dc4/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesProducerTest.java index 168c969..8848fbd 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesProducerTest.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.KubernetesPersistentVolumesProducerTest; +import org.junit.Ignore; +@Ignore @Deprecated public class DeprecatedKubernetesPersistentVolumesProducerTest extends KubernetesPersistentVolumesProducerTest { http://git-wip-us.apache.org/repos/asf/camel/blob/d5f98dc4/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java index 425e44f..05c1a1f 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesProducerTest.java @@ -21,50 +21,57 @@ import java.util.List; import java.util.Map; import io.fabric8.kubernetes.api.model.PersistentVolume; +import io.fabric8.kubernetes.api.model.PersistentVolumeListBuilder; +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 KubernetesPersistentVolumesProducerTest 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<PersistentVolume> result = template.requestBody("direct:list", "", - List.class); + server.expect().withPath("/api/v1/persistentvolumes").andReturn(200, new PersistentVolumeListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()) + .once(); + List<PersistentVolume> result = template.requestBody("direct:list", "", List.class); - assertTrue(result.size() == 1); + assertEquals(3, result.size()); } @Test public void listByLabelsTest() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } + server.expect().withPath("/api/v1/persistentvolumes?labelSelector=" + toUrlEncoded("key1=value1,key2=value2")) + .andReturn(200, new PersistentVolumeListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once(); Exchange ex = template.request("direct:listByLabels", new Processor() { @Override public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "default"); Map<String, String> labels = new HashMap<String, String>(); - labels.put("component", "elasticsearch"); - exchange.getIn() - .setHeader( - KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS, - labels); + labels.put("key1", "value1"); + labels.put("key2", "value2"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_LABELS, labels); } }); List<PersistentVolume> result = ex.getOut().getBody(List.class); + + assertEquals(3, result.size()); } @Override @@ -72,12 +79,8 @@ public class KubernetesPersistentVolumesProducerTest extends KubernetesTestSuppo return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:list") - .toF("kubernetes-persistent-volumes://%s?oauthToken=%s&operation=listPersistentVolumes", - host, authToken); - from("direct:listByLabels") - .toF("kubernetes-persistent-volumes://%s?oauthToken=%s&operation=listPersistentVolumesByLabels", - host, authToken); + from("direct:list").to("kubernetes-persistent-volumes:///?kubernetesClient=#kubernetesClient&operation=listPersistentVolumes"); + from("direct:listByLabels").to("kubernetes-persistent-volumes:///?kubernetesClient=#kubernetesClient&operation=listPersistentVolumesByLabels"); } }; }
