This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit bccdbac9aae110aeffe4eb7342c1c03323a99088 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 13 16:27:21 2020 +0200 [CAMEL-11807] Upgrade camel-kubernetes to junit5 --- components/camel-kubernetes/pom.xml | 2 +- .../apache/camel/component/KubernetesServer.java | 112 +++++++++++++++++++++ .../apache/camel/component/OpenShiftServer.java | 106 +++++++++++++++++++ .../kubernetes/KubernetesTestSupport.java | 7 +- .../cloud/ServiceCallClientRouteTest.java | 8 +- .../cloud/ServiceCallEnvironmentRouteTest.java | 8 +- .../cloud/SpringServiceCallClientRouteTest.java | 8 +- .../cloud/SpringServiceCallDnsRouteTest.java | 8 +- .../SpringServiceCallEnvironmentRouteTest.java | 8 +- .../cluster/KubernetesClusterServiceTest.java | 32 +++--- .../cluster/TimedLeaderNotifierTest.java | 12 +-- .../kubernetes/cluster/utils/LeaderRecorder.java | 8 +- .../cluster/utils/LockTestServerTest.java | 24 ++--- .../consumer/KubernetesConfigMapsConsumerTest.java | 8 +- .../consumer/KubernetesNamespacesConsumerTest.java | 9 +- .../consumer/KubernetesNodesConsumerTest.java | 8 +- .../consumer/KubernetesPodsConsumerTest.java | 8 +- ...bernetesReplicationControllersConsumerTest.java | 9 +- .../consumer/KubernetesServicesConsumerTest.java | 9 +- .../producer/KubernetesConfigMapsProducerTest.java | 11 +- .../KubernetesDeploymentsProducerTest.java | 11 +- .../producer/KubernetesHPAProducerTest.java | 11 +- .../producer/KubernetesJobProducerTest.java | 11 +- .../producer/KubernetesNamespacesProducerTest.java | 11 +- .../producer/KubernetesNodesProducerTest.java | 11 +- ...ernetesPersistentVolumesClaimsProducerTest.java | 11 +- .../KubernetesPersistentVolumesProducerTest.java | 10 +- .../producer/KubernetesPodsProducerTest.java | 11 +- ...bernetesReplicationControllersProducerTest.java | 12 ++- .../KubernetesResourcesQuotaProducerTest.java | 11 +- .../producer/KubernetesSecretsProducerTest.java | 12 ++- .../KubernetesServiceAccountsProducerTest.java | 11 +- .../producer/KubernetesServicesProducerTest.java | 12 ++- .../OpenshiftBuildConfigsProducerTest.java | 10 +- .../producer/OpenshiftBuildsProducerTest.java | 10 +- 35 files changed, 429 insertions(+), 141 deletions(-) diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml index 0d5aa3d..55238da 100644 --- a/components/camel-kubernetes/pom.xml +++ b/components/camel-kubernetes/pom.xml @@ -79,7 +79,7 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/KubernetesServer.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/KubernetesServer.java new file mode 100644 index 0000000..5f3e533 --- /dev/null +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/KubernetesServer.java @@ -0,0 +1,112 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component; + +import java.util.HashMap; + +import io.fabric8.kubernetes.client.NamespacedKubernetesClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; +import io.fabric8.mockwebserver.Context; +import io.fabric8.mockwebserver.dsl.MockServerExpectation; +import io.fabric8.mockwebserver.dsl.ReturnOrWebsocketable; +import io.fabric8.mockwebserver.dsl.TimesOnceableOrHttpHeaderable; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +public class KubernetesServer implements BeforeEachCallback, AfterEachCallback { + + private KubernetesMockServer mock; + private NamespacedKubernetesClient client; + private boolean https; + private boolean crudMode; + + public KubernetesServer() { + this(true, false); + } + + public KubernetesServer(boolean https) { + this(https, false); + } + + public KubernetesServer(boolean https, boolean crudMode) { + this.https = https; + this.crudMode = crudMode; + } + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + this.mock = this.crudMode ? new KubernetesMockServer(new Context(), new MockWebServer(), new HashMap(), new KubernetesCrudDispatcher(), true) : new KubernetesMockServer(this.https); + this.mock.init(); + this.client = this.mock.createClient(); + } + + @Override + public void afterEach(ExtensionContext context) throws Exception { + this.mock.destroy(); + this.client.close(); + } + + public NamespacedKubernetesClient getClient() { + return this.client; + } + + public MockServerExpectation expect() { + return this.mock.expect(); + } + + /** @deprecated */ + @Deprecated + public <T> void expectAndReturnAsJson(String path, int code, T body) { + ((TimesOnceableOrHttpHeaderable)((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always(); + } + + /** @deprecated */ + @Deprecated + public void expectAndReturnAsString(String path, int code, String body) { + ((TimesOnceableOrHttpHeaderable)((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always(); + } + + /** @deprecated */ + @Deprecated + public <T> void expectAndReturnAsJson(String method, String path, int code, T body) { + ((TimesOnceableOrHttpHeaderable)((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always(); + } + + /** @deprecated */ + @Deprecated + public void expectAndReturnAsString(String method, String path, int code, String body) { + ((TimesOnceableOrHttpHeaderable)((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always(); + } + + public MockWebServer getMockServer() { + return this.mock.getServer(); + } + + public RecordedRequest getLastRequest() throws InterruptedException { + int count = this.mock.getServer().getRequestCount(); + + RecordedRequest request; + for (request = null; count-- > 0; request = this.mock.getServer().takeRequest()) { + } + + return request; + } +} diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/OpenShiftServer.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/OpenShiftServer.java new file mode 100644 index 0000000..cfd0f46 --- /dev/null +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/OpenShiftServer.java @@ -0,0 +1,106 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component; + +import java.util.HashMap; + +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher; +import io.fabric8.mockwebserver.Context; +import io.fabric8.mockwebserver.dsl.MockServerExpectation; +import io.fabric8.mockwebserver.dsl.ReturnOrWebsocketable; +import io.fabric8.mockwebserver.dsl.TimesOnceableOrHttpHeaderable; +import io.fabric8.openshift.client.NamespacedOpenShiftClient; +import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; + +public class OpenShiftServer implements BeforeEachCallback, AfterEachCallback { + + protected OpenShiftMockServer mock; + private NamespacedOpenShiftClient client; + private boolean https; + private boolean curdMode; + + public OpenShiftServer() { + this(true, false); + } + + public OpenShiftServer(boolean https) { + this(https, false); + } + + public OpenShiftServer(boolean https, boolean curdMode) { + this.https = https; + this.curdMode = curdMode; + } + + @Override + public void beforeEach(ExtensionContext context) throws Exception { + this.mock = this.curdMode ? new OpenShiftMockServer(new Context(), new MockWebServer(), new HashMap(), new KubernetesCrudDispatcher(), true) : new OpenShiftMockServer(this.https); + this.mock.init(); + this.client = this.mock.createOpenShiftClient(); + } + + @Override + public void afterEach(ExtensionContext context) throws Exception { + this.mock.destroy(); + this.client.close(); + } + + public KubernetesClient getKubernetesClient() { + return this.client; + } + + public NamespacedOpenShiftClient getOpenshiftClient() { + return this.client; + } + + public MockServerExpectation expect() { + return this.mock.expect(); + } + + /** @deprecated */ + @Deprecated + public <T> void expectAndReturnAsJson(String path, int code, T body) { + ((TimesOnceableOrHttpHeaderable)((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always(); + } + + /** @deprecated */ + @Deprecated + public void expectAndReturnAsString(String path, int code, String body) { + ((TimesOnceableOrHttpHeaderable)((ReturnOrWebsocketable) this.expect().withPath(path)).andReturn(code, body)).always(); + } + + public MockWebServer getMockServer() { + return this.mock.getServer(); + } + + public RecordedRequest getLastRequest() throws InterruptedException { + int count = this.mock.getServer().getRequestCount(); + + RecordedRequest request; + for (request = null; count-- > 0; request = this.mock.getServer().takeRequest()) { + } + + return request; + } + +} diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java index 90d7cd4..b1a408b 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/KubernetesTestSupport.java @@ -19,12 +19,16 @@ package org.apache.camel.component.kubernetes; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class KubernetesTestSupport extends CamelTestSupport { protected String authToken; protected String host; + protected Logger log = LoggerFactory.getLogger(getClass()); // The Camel-Kubernetes tests are based on vagrant fabric8-image // https://github.com/fabric8io/fabric8-installer/tree/master/vagrant/openshift @@ -32,6 +36,7 @@ public class KubernetesTestSupport extends CamelTestSupport { // Openshift/Kubernetes installed @Override + @BeforeEach public void setUp() throws Exception { // INSERT credentials and host here authToken = ""; diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteTest.java index 959096f..c9410d9 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallClientRouteTest.java @@ -20,11 +20,11 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.kubernetes.KubernetesConfiguration; import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Manual test") +@Disabled("Manual test") public class ServiceCallClientRouteTest extends CamelTestSupport { @Test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java index d5b989d..0c68842 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/ServiceCallEnvironmentRouteTest.java @@ -19,11 +19,11 @@ package org.apache.camel.component.kubernetes.cloud; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Manual test") +@Disabled("Manual test") public class ServiceCallEnvironmentRouteTest extends CamelTestSupport { @Test diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteTest.java index db687b4..471df21 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallClientRouteTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.component.kubernetes.cloud; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -@Ignore("Manual test") +@Disabled("Manual test") public class SpringServiceCallClientRouteTest extends CamelSpringTestSupport { @Override diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteTest.java index b8e8300..e5ab167 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallDnsRouteTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.component.kubernetes.cloud; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -@Ignore("Manual test") +@Disabled("Manual test") public class SpringServiceCallDnsRouteTest extends CamelSpringTestSupport { @Override diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteTest.java index 1e7f3e7..3f8506c 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cloud/SpringServiceCallEnvironmentRouteTest.java @@ -16,13 +16,13 @@ */ package org.apache.camel.component.kubernetes.cloud; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -@Ignore("Manual test") +@Disabled("Manual test") public class SpringServiceCallEnvironmentRouteTest extends CamelSpringTestSupport { @Override diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java index 2b5129f..ccccb0f 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/KubernetesClusterServiceTest.java @@ -31,10 +31,16 @@ import org.apache.camel.component.kubernetes.KubernetesConfiguration; import org.apache.camel.component.kubernetes.cluster.utils.ConfigMapLockSimulator; import org.apache.camel.component.kubernetes.cluster.utils.LeaderRecorder; import org.apache.camel.component.kubernetes.cluster.utils.LockTestServer; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test leader election scenarios using a mock server. @@ -50,13 +56,13 @@ public class KubernetesClusterServiceTest extends CamelTestSupport { private Map<String, LockTestServer> lockServers; - @Before + @BeforeEach public void prepareLock() { this.lockSimulator = new ConfigMapLockSimulator("leaders"); this.lockServers = new HashMap<>(); } - @After + @AfterEach public void shutdownLock() { for (LockTestServer server : this.lockServers.values()) { try { @@ -79,7 +85,7 @@ public class KubernetesClusterServiceTest extends CamelTestSupport { String leader = mypod1.getCurrentLeader(); assertNotNull(leader); assertTrue(leader.startsWith("mypod")); - assertEquals("Leaders should be equals", mypod2.getCurrentLeader(), leader); + assertEquals(mypod2.getCurrentLeader(), leader, "Leaders should be equals"); } @Test @@ -111,7 +117,7 @@ public class KubernetesClusterServiceTest extends CamelTestSupport { String leader = mypod1.getCurrentLeader(); assertTrue(leader.startsWith("mypod")); - assertEquals("Leaders should be equals", mypod2.getCurrentLeader(), leader); + assertEquals(mypod2.getCurrentLeader(), leader, "Leaders should be equals"); } @Test @@ -135,13 +141,13 @@ public class KubernetesClusterServiceTest extends CamelTestSupport { formerLoserRecorder.waitForANewLeader(firstLeader, 7, TimeUnit.SECONDS); String secondLeader = formerLoserRecorder.getCurrentLeader(); - assertNotEquals("The firstLeader should be different from the new one", firstLeader, secondLeader); + assertNotEquals(firstLeader, secondLeader, "The firstLeader should be different from the new one"); Long lossTimestamp = formerLeaderRecorder.getLastTimeOf(l -> l == null); Long gainTimestamp = formerLoserRecorder.getLastTimeOf(secondLeader::equals); - assertTrue("At least half distance must elapse from leadership loss and regain (see renewDeadlineSeconds)", - gainTimestamp >= lossTimestamp + (LEASE_TIME_MILLIS - RENEW_DEADLINE_MILLIS) / 2); + assertTrue(gainTimestamp >= lossTimestamp + (LEASE_TIME_MILLIS - RENEW_DEADLINE_MILLIS) / 2, + "At least half distance must elapse from leadership loss and regain (see renewDeadlineSeconds)"); checkLeadershipChangeDistance((LEASE_TIME_MILLIS - RENEW_DEADLINE_MILLIS) / 2, TimeUnit.MILLISECONDS, mypod1, mypod2); } @@ -249,8 +255,8 @@ public class KubernetesClusterServiceTest extends CamelTestSupport { } else if (info.getLeader() != null && !info.getLeader().equals(currentLeaderLastSeen.getLeader())) { // switch long delay = info.getChangeTimestamp() - currentLeaderLastSeen.getChangeTimestamp(); - assertTrue("Lease time not elapsed between switch, minimum=" + TimeUnit.MILLISECONDS.convert(minimum, unit) + ", found=" + delay, - delay >= TimeUnit.MILLISECONDS.convert(minimum, unit)); + assertTrue(delay >= TimeUnit.MILLISECONDS.convert(minimum, unit), + "Lease time not elapsed between switch, minimum=" + TimeUnit.MILLISECONDS.convert(minimum, unit) + ", found=" + delay); currentLeaderLastSeen = info; } } diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java index 24f029e..94e899c 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/TimedLeaderNotifierTest.java @@ -26,11 +26,11 @@ import org.apache.camel.CamelContext; import org.apache.camel.component.kubernetes.cluster.lock.KubernetesClusterEvent; import org.apache.camel.component.kubernetes.cluster.lock.TimedLeaderNotifier; import org.apache.camel.impl.DefaultCamelContext; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Test the behavior of the timed notifier. @@ -45,7 +45,7 @@ public class TimedLeaderNotifierTest { private volatile Set<String> currentMembers; - @Before + @BeforeEach public void init() throws Exception { this.context = new DefaultCamelContext(); this.context.start(); @@ -60,7 +60,7 @@ public class TimedLeaderNotifierTest { this.notifier.start(); } - @After + @AfterEach public void destroy() throws Exception { this.notifier.stop(); this.context.stop(); diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java index b4cb770..d41bc65 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LeaderRecorder.java @@ -28,10 +28,11 @@ import java.util.function.Predicate; import org.apache.camel.cluster.CamelClusterEventListener; import org.apache.camel.cluster.CamelClusterMember; import org.apache.camel.cluster.CamelClusterView; -import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertFalse; + /** * Records leadership changes and allow to do assertions. */ @@ -67,9 +68,8 @@ public class LeaderRecorder implements CamelClusterEventListener.Leadership { public void waitForLeader(Predicate<String> as, long time, TimeUnit unit) { long start = System.currentTimeMillis(); while (!as.test(getCurrentLeader())) { - if (System.currentTimeMillis() - start > TimeUnit.MILLISECONDS.convert(time, unit)) { - Assert.fail("Timeout while waiting for condition"); - } + assertFalse(System.currentTimeMillis() - start > TimeUnit.MILLISECONDS.convert(time, unit), + "Timeout while waiting for condition"); doWait(50); } } diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java index d2edba5..641c6a6 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/cluster/utils/LockTestServerTest.java @@ -19,11 +19,11 @@ package org.apache.camel.component.kubernetes.cluster.utils; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Basic tests on the lock test server. @@ -40,11 +40,9 @@ public class LockTestServerTest { client.configMaps().withName("xxx").createNew().withNewMetadata().withName("xxx").and().done(); - try { - client.configMaps().withName("xxx").createNew().withNewMetadata().withName("xxx").and().done(); - Assert.fail("Should have failed for duplicate insert"); - } catch (Exception e) { - } + assertThrows(Exception.class, + () -> client.configMaps().withName("xxx").createNew().withNewMetadata().withName("xxx").and().done(), + "Should have failed for duplicate insert"); client.configMaps().withName("xxx").createOrReplaceWithNew().editOrNewMetadata().withName("xxx").addToLabels("a", "b").and().done(); @@ -57,12 +55,10 @@ public class LockTestServerTest { ConfigMap newMap = client.configMaps().withName("xxx").get(); assertEquals("d", newMap.getMetadata().getLabels().get("c")); - try { + assertThrows(Exception.class, () -> client.configMaps().withName("xxx").lockResourceVersion(map.getMetadata().getResourceVersion()) - .replace(new ConfigMapBuilder(map).editOrNewMetadata().withName("xxx").addToLabels("e", "f").and().build()); - Assert.fail("Should have failed for wrong version"); - } catch (Exception ex) { - } + .replace(new ConfigMapBuilder(map).editOrNewMetadata().withName("xxx").addToLabels("e", "f").and().build()), + "Should have failed for wrong version"); ConfigMap newMap2 = client.configMaps().withName("xxx").get(); assertNull(newMap2.getMetadata().getLabels().get("e")); diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java index d81070e..602e345 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesConfigMapsConsumerTest.java @@ -29,10 +29,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Requires a running Kubernetes Cluster") +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Requires a running Kubernetes Cluster") public class KubernetesConfigMapsConsumerTest extends KubernetesTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java index 5b7c4d2..ced7429 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumerTest.java @@ -31,10 +31,13 @@ import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Requires a running Kubernetes Cluster") +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Requires a running Kubernetes Cluster") public class KubernetesNamespacesConsumerTest extends KubernetesTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java index eb6368b..291ec59 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java @@ -34,10 +34,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Requires a running Kubernetes Cluster") +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Requires a running Kubernetes Cluster") public class KubernetesNodesConsumerTest extends KubernetesTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java index 78b9d0a..7c7f49d 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java @@ -34,10 +34,12 @@ import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Requires a running Kubernetes Cluster") +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Requires a running Kubernetes Cluster") public class KubernetesPodsConsumerTest extends KubernetesTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java index f6e1e48..f98660f 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesReplicationControllersConsumerTest.java @@ -32,10 +32,13 @@ import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Requires a running Kubernetes Cluster") +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Requires a running Kubernetes Cluster") public class KubernetesReplicationControllersConsumerTest extends KubernetesTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java index ab1cc57..f21fdd9 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesServicesConsumerTest.java @@ -34,10 +34,13 @@ import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.ObjectHelper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Requires a running Kubernetes Cluster") +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@Disabled("Requires a running Kubernetes Cluster") public class KubernetesServicesConsumerTest extends KubernetesTestSupport { @EndpointInject("mock:result") 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 e430d8d..aafca27 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 @@ -25,18 +25,21 @@ import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapListBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesConfigMapsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 dbba0ad..bad12bd 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 @@ -24,18 +24,21 @@ import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder; import io.fabric8.kubernetes.api.model.apps.DeploymentListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesDeploymentsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java index fc704cd..bb3856e 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesHPAProducerTest.java @@ -25,19 +25,22 @@ import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerBuilder; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesHPAProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 3cc49a7..a862480 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 @@ -25,18 +25,21 @@ import io.fabric8.kubernetes.api.model.batch.Job; import io.fabric8.kubernetes.api.model.batch.JobBuilder; import io.fabric8.kubernetes.api.model.batch.JobListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class KubernetesJobProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 af47106..688e30b 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 @@ -23,18 +23,21 @@ 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.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesNamespacesProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java index 07508e0..665eb9c 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesNodesProducerTest.java @@ -27,18 +27,21 @@ import io.fabric8.kubernetes.api.model.NodeSpec; import io.fabric8.kubernetes.api.model.NodeSpecBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesNodesProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 58c4223..a383304 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 @@ -26,18 +26,21 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder; import io.fabric8.kubernetes.api.model.PersistentVolumeClaimListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesPersistentVolumesClaimsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 5e2c64f..7685635 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 @@ -23,18 +23,20 @@ import java.util.Map; import io.fabric8.kubernetes.api.model.PersistentVolume; import io.fabric8.kubernetes.api.model.PersistentVolumeListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class KubernetesPersistentVolumesProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java index f9e1216..b5935f1 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java @@ -24,18 +24,21 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesPodsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 1780309..02fc778 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 @@ -24,18 +24,22 @@ import io.fabric8.kubernetes.api.model.ReplicationController; import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder; import io.fabric8.kubernetes.api.model.ReplicationControllerListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesReplicationControllersProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java index ad35a8b..022a071e 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesResourcesQuotaProducerTest.java @@ -22,18 +22,21 @@ import io.fabric8.kubernetes.api.model.ResourceQuota; import io.fabric8.kubernetes.api.model.ResourceQuotaBuilder; import io.fabric8.kubernetes.api.model.ResourceQuotaListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesResourcesQuotaProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 1c68960..3a4a283 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 @@ -24,18 +24,22 @@ import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.SecretListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesSecretsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 e9dd057..dd58c54 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 @@ -24,18 +24,21 @@ import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccountBuilder; import io.fabric8.kubernetes.api.model.ServiceAccountListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesServiceAccountsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") 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 5d6f8e1..8daae55 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 @@ -25,18 +25,22 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServiceListBuilder; import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.KubernetesServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class KubernetesServicesProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public KubernetesServer server = new KubernetesServer(); @BindToRegistry("kubernetesClient") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java index c50ab5e..ffa5000 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildConfigsProducerTest.java @@ -22,16 +22,18 @@ import io.fabric8.kubernetes.api.model.APIGroupListBuilder; import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigListBuilder; import io.fabric8.openshift.client.NamespacedOpenShiftClient; -import io.fabric8.openshift.client.server.mock.OpenShiftServer; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.OpenShiftServer; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class OpenshiftBuildConfigsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public OpenShiftServer server = new OpenShiftServer(); @BindToRegistry("client") diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java index 46ac997..9daec9c 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/openshift/producer/OpenshiftBuildsProducerTest.java @@ -24,19 +24,21 @@ import io.fabric8.kubernetes.api.model.APIGroupListBuilder; import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.BuildListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.OpenShiftServer; import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.OpenShiftServer; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class OpenshiftBuildsProducerTest extends KubernetesTestSupport { - @Rule + @RegisterExtension public OpenShiftServer server = new OpenShiftServer(); @BindToRegistry("client")
