You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2022/10/07 14:00:13 UTC
[camel] 02/04: CAMEL-17438: camel-kubernetes - Remove unused routes in tests
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-17438/add-update-to-producers
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e8593bca46c99ae69efffec2bcb4ba0f20f1fe79
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Oct 7 10:12:56 2022 +0200
CAMEL-17438: camel-kubernetes - Remove unused routes in tests
---
.../consumer/integration/KubernetesNamespacesConsumerIT.java | 2 --
.../integration/KubernetesReplicationControllersConsumerIT.java | 9 ---------
.../consumer/integration/KubernetesServicesConsumerIT.java | 4 ----
.../kubernetes/producer/KubernetesConfigMapsProducerTest.java | 4 +---
.../producer/KubernetesCustomResourcesProducerTest.java | 2 --
.../kubernetes/producer/KubernetesDeploymentsProducerTest.java | 6 ++----
.../component/kubernetes/producer/KubernetesJobProducerTest.java | 2 --
.../kubernetes/producer/KubernetesNamespacesProducerTest.java | 2 +-
.../producer/KubernetesPersistentVolumesClaimsProducerTest.java | 2 +-
.../producer/KubernetesReplicationControllersProducerTest.java | 6 ++----
.../kubernetes/producer/KubernetesSecretsProducerTest.java | 3 +--
.../producer/KubernetesServiceAccountsProducerTest.java | 2 +-
.../kubernetes/producer/KubernetesServicesProducerTest.java | 2 +-
.../producer/OpenshiftDeploymentConfigsProducerTest.java | 6 ++----
14 files changed, 12 insertions(+), 40 deletions(-)
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java
index d4f5b840369..31eb6e02a76 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesNamespacesConsumerIT.java
@@ -116,10 +116,8 @@ public class KubernetesNamespacesConsumerIT extends KubernetesTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- 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,
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java
index f0607e6e61a..39cfed9d34c 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesReplicationControllersConsumerIT.java
@@ -111,15 +111,6 @@ public class KubernetesReplicationControllersConsumerIT extends KubernetesTestSu
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:list").toF(
- "kubernetes-replication-controllers://%s?oauthToken=%s&operation=listReplicationControllers", host,
- authToken);
- from("direct:listByLabels").toF(
- "kubernetes-replication-controllers://%s?oauthToken=%s&operation=listReplicationControllersByLabels",
- host, authToken);
- from("direct:getReplicationController").toF(
- "kubernetes-replication-controllers://%s?oauthToken=%s&operation=getReplicationController", host,
- authToken);
from("direct:createReplicationController").toF(
"kubernetes-replication-controllers://%s?oauthToken=%s&operation=createReplicationController", host,
authToken);
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java
index 7040cbbf55b..f254f540ee7 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/integration/KubernetesServicesConsumerIT.java
@@ -112,10 +112,6 @@ public class KubernetesServicesConsumerIT extends KubernetesTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:list").toF("kubernetes-services://%s?oauthToken=%s&operation=listServices", host, authToken);
- from("direct:listByLabels").toF("kubernetes-services://%s?oauthToken=%s&operation=listServicesByLabels", host,
- authToken);
- from("direct:getServices").toF("kubernetes-services://%s?oauthToken=%s&operation=getService", host, authToken);
from("direct:createService").toF("kubernetes-services://%s?oauthToken=%s&operation=createService", host,
authToken);
from("direct:deleteService").toF("kubernetes-services://%s?oauthToken=%s&operation=deleteService", host,
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
index fc18509ca1d..a13cd12bfba 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesConfigMapsProducerTest.java
@@ -110,7 +110,7 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
}
@Test
- void createGetAndDeleteConfigMap() {
+ void deleteConfigMap() {
ConfigMap cm1 = new ConfigMapBuilder().withNewMetadata().withName("cm1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/configmaps/cm1").andReturn(200, cm1).once();
@@ -135,8 +135,6 @@ public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport {
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=listConfigMapsByLabels");
from("direct:getConfigMap")
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=getConfigMap");
- from("direct:createConfigMap")
- .to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=createConfigMap");
from("direct:deleteConfigMap")
.to("kubernetes-config-maps:///?kubernetesClient=#kubernetesClient&operation=deleteConfigMap");
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
index d203627c727..1b1b2d59750 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesCustomResourcesProducerTest.java
@@ -196,8 +196,6 @@ public class KubernetesCustomResourcesProducerTest extends KubernetesTestSupport
return new RouteBuilder() {
@Override
public void configure() {
- from("direct:getCustomResource")
- .toF("kubernetes-custom-resources:///?kubernetesClient=#kubernetesClient&operation=getCustomResource");
from("direct:listCustomResources").toF(
"kubernetes-custom-resources:///?kubernetesClient=#kubernetesClient&operation=listCustomResources");
from("direct:listCustomResourcesByLabels").toF(
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
index 3f6d1c78d19..9275fc15540 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesDeploymentsProducerTest.java
@@ -77,7 +77,7 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
}
@Test
- void createAndDeleteDeployment() {
+ void deleteDeployment() {
Deployment de1 = new DeploymentBuilder().withNewMetadata().withNamespace("test").withName("de1")
.withResourceVersion("1").withGeneration(2L).endMetadata().withNewSpec()
.withReplicas(0).endSpec().withNewStatus().withReplicas(1).withObservedGeneration(1L).endStatus().build();
@@ -100,7 +100,7 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
}
@Test
- void createScaleAndDeleteDeployment() {
+ void scaleDeployment() {
server.expect().withPath("/apis/apps/v1/namespaces/test/deployments/de1")
.andReturn(200, new DeploymentBuilder().withNewMetadata().withName("de1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(5).endSpec().withNewStatus()
@@ -134,8 +134,6 @@ public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport {
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=listDeploymentsByLabels");
from("direct:deleteDeployment")
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=deleteDeployment");
- from("direct:createDeployment")
- .toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=createDeployment");
from("direct:scaleDeployment")
.toF("kubernetes-deployments:///?kubernetesClient=#kubernetesClient&operation=scaleDeployment");
}
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
index 05df966fca0..57e560bc64a 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesJobProducerTest.java
@@ -99,8 +99,6 @@ public class KubernetesJobProducerTest extends KubernetesTestSupport {
from("direct:list").to("kubernetes-job:foo?operation=listJob");
from("direct:listByLabels").to("kubernetes-job:foo?operation=listJobByLabels");
from("direct:get").to("kubernetes-job:foo?operation=getJob");
- from("direct:create").to("kubernetes-job:foo?operation=createJob");
- from("direct:delete").to("kubernetes-job:foo?operation=deleteJob");
}
};
}
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 abddf8a5b6c..f2571e0aa0b 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
@@ -72,7 +72,7 @@ public class KubernetesNamespacesProducerTest extends KubernetesTestSupport {
}
@Test
- void createAndDeleteNamespace() {
+ void deleteNamespace() {
Namespace ns1 = new NamespaceBuilder().withNewMetadata().withName("ns1").endMetadata().build();
server.expect().withPath("/api/v1/namespaces/ns1").andReturn(200, ns1).once();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
index e088baa35f2..88cfbb28e30 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
@@ -80,7 +80,7 @@ public class KubernetesPersistentVolumesClaimsProducerTest extends KubernetesTes
}
@Test
- void createListAndDeletePersistentVolumeClaim() {
+ void deletePersistentVolumeClaim() {
ObjectMeta meta = new ObjectMeta();
meta.setName("pvc1");
server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims/pvc1")
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
index 0f9d16dbff4..c3c1499dd8d 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesReplicationControllersProducerTest.java
@@ -97,7 +97,7 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
}
@Test
- void createAndDeleteReplicationController() {
+ void deleteReplicationController() {
server.expect().withPath("/api/v1/namespaces/test/replicationcontrollers/repl1")
.andReturn(200, new ReplicationControllerBuilder().withNewMetadata().withName("repl1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(0).endSpec().withNewStatus()
@@ -121,7 +121,7 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
}
@Test
- void createScaleAndDeleteReplicationController() {
+ void scaleReplicationController() {
server.expect().withPath("/api/v1/namespaces/test/replicationcontrollers/repl1")
.andReturn(200, new ReplicationControllerBuilder().withNewMetadata().withName("repl1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(5).endSpec().withNewStatus()
@@ -154,8 +154,6 @@ public class KubernetesReplicationControllersProducerTest extends KubernetesTest
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=listReplicationControllersByLabels");
from("direct:getReplicationController").to(
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=getReplicationController");
- from("direct:createReplicationController").to(
- "kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=createReplicationController");
from("direct:scaleReplicationController").to(
"kubernetes-replication-controllers:///?kubernetesClient=#kubernetesClient&operation=scaleReplicationController");
from("direct:deleteReplicationController").to(
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
index b9fb1c75caa..44ad238d66d 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesSecretsProducerTest.java
@@ -92,7 +92,7 @@ public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
}
@Test
- void createAndDeleteSecret() {
+ void deleteSecret() {
Secret sc1 = new SecretBuilder().withNewMetadata().withName("sc1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/secrets/sc1").andReturn(200, sc1).once();
@@ -115,7 +115,6 @@ public class KubernetesSecretsProducerTest extends KubernetesTestSupport {
from("direct:listByLabels")
.to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=listSecretsByLabels");
from("direct:get").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=getSecret");
- from("direct:create").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=createSecret");
from("direct:delete").to("kubernetes-secrets:///?kubernetesClient=#kubernetesClient&operation=deleteSecret");
}
};
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
index ee9fb27c586..7a70d47ed31 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServiceAccountsProducerTest.java
@@ -78,7 +78,7 @@ public class KubernetesServiceAccountsProducerTest extends KubernetesTestSupport
}
@Test
- void createAndDeleteServiceAccount() {
+ void deleteServiceAccount() {
ServiceAccount pod1 = new ServiceAccountBuilder().withNewMetadata().withName("sa1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/serviceaccounts/sa1").andReturn(200, pod1).once();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
index 85bb4e48f95..15b59aa0782 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java
@@ -91,7 +91,7 @@ public class KubernetesServicesProducerTest extends KubernetesTestSupport {
}
@Test
- void createAndDeleteService() {
+ void deleteService() {
Service se1 = new ServiceBuilder().withNewMetadata().withName("se1").withNamespace("test").and().build();
server.expect().withPath("/api/v1/namespaces/test/services/se1").andReturn(200, se1).once();
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
index b8b6106ea43..393b6b075a2 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftDeploymentConfigsProducerTest.java
@@ -77,7 +77,7 @@ public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSuppor
}
@Test
- void createAndDeleteDeploymentConfig() {
+ void deleteDeploymentConfig() {
DeploymentConfig de1 = new DeploymentConfigBuilder().withNewMetadata().withNamespace("test").withName("dc1")
.withResourceVersion("1").withGeneration(2L).endMetadata().withNewSpec()
.withReplicas(0).endSpec().withNewStatus().withReplicas(1).withObservedGeneration(1L).endStatus().build();
@@ -101,7 +101,7 @@ public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSuppor
}
@Test
- void createScaleAndDeleteDeploymentConfig() {
+ void scaleDeploymentConfig() {
server.expect().withPath("/apis/apps.openshift.io/v1/namespaces/test/deploymentconfigs/dc1")
.andReturn(200, new DeploymentConfigBuilder().withNewMetadata().withName("dc1")
.withResourceVersion("1").endMetadata().withNewSpec().withReplicas(5).endSpec().withNewStatus()
@@ -136,8 +136,6 @@ public class OpenshiftDeploymentConfigsProducerTest extends KubernetesTestSuppor
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=listDeploymentConfigsByLabels");
from("direct:delete")
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=deleteDeploymentConfig");
- from("direct:create")
- .toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=createDeploymentConfig");
from("direct:scale")
.toF("openshift-deploymentconfigs:///?kubernetesClient=#kubernetesClient&operation=scaleDeploymentConfig");
}