You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/27 15:38:57 UTC
[camel] 10/43: [CAMEL-11807] Upgrade camel-zookeeper to junit5
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 0876ea8b235a9700db3f3637aab75c61ba455ade
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:17:07 2020 +0200
[CAMEL-11807] Upgrade camel-zookeeper to junit5
---
.../org/apache/camel/test/AvailablePortFinder.java | 40 +++++++-
.../AvailablePortFinderPropertiesFunction.java | 105 +++++++++++++++++++++
components/camel-zookeeper/pom.xml | 20 +++-
.../component/zookeeper/ConsumeChildrenTest.java | 7 +-
.../camel/component/zookeeper/ConsumeDataTest.java | 7 +-
.../zookeeper/NaturalSortComparatorTest.java | 4 +-
.../zookeeper/ZooKeeperCuratorHelperTest.java | 10 +-
.../component/zookeeper/ZooKeeperEndpointTest.java | 12 ++-
.../zookeeper/ZooKeeperManagedEndpointTest.java | 6 +-
.../component/zookeeper/ZooKeeperProducerTest.java | 5 +-
.../component/zookeeper/ZooKeeperTestSupport.java | 8 +-
.../component/zookeeper/ZooKeeperUtilsTest.java | 5 +-
.../zookeeper/ZookeeperConnectionManagerTest.java | 4 +-
.../cloud/SpringZooKeeperServiceCallRouteTest.java | 4 +-
.../cloud/ZooKeeperServiceCallRouteTest.java | 4 +-
.../cloud/ZooKeeperServiceDiscoveryTest.java | 9 +-
.../ZooKeeperServiceRegistrationTestBase.java | 11 ++-
...ngZooKeeperClusteredRouteConfigurationTest.java | 7 +-
.../ZooKeeperClusteredRoutePolicyFactoryTest.java | 10 +-
.../cluster/ZooKeeperClusteredRoutePolicyTest.java | 10 +-
.../zookeeper/cluster/ZooKeeperMasterTest.java | 10 +-
.../zookeeper/operations/AnyOfOperationTest.java | 4 +-
.../operations/ChildrenChangedOperationTest.java | 4 +-
.../zookeeper/operations/CreateOperationTest.java | 9 +-
.../operations/DataChangedOperationTest.java | 7 +-
.../operations/ExistenceChangedOperationTest.java | 6 +-
.../operations/ExistenceOperationTest.java | 5 +-
.../operations/FutureEventDrivenOperationTest.java | 4 +-
.../zookeeper/operations/SetDataOperationTest.java | 8 +-
29 files changed, 270 insertions(+), 75 deletions(-)
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
index a6a38bd..10f2d76 100644
--- a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinder.java
@@ -45,14 +45,46 @@ public final class AvailablePortFinder {
* @return the available port
*/
public static int getNextAvailable() {
+ return probePort(0);
+ }
+
+ /**
+ * Gets the next available port in the given range.
+ *
+ * @param fromPort port number start range.
+ * @param toPort port number end range.
+ *
+ * @throws IllegalStateException if there are no ports available
+ * @return the available port
+ */
+ public static int getNextAvailable(int fromPort, int toPort) {
+ for (int i = fromPort; i <= toPort; i++) {
+ try {
+ return probePort(i);
+ } catch (IllegalStateException e) {
+ // do nothing, let's try the next port
+ }
+ }
+ throw new IllegalStateException("Cannot find free port");
+ }
+
+ /**
+ * Probe a port to see if it is free
+ *
+ * @param port an integer port number to be tested. If port is 0, then the next available port is returned.
+ * @throws IllegalStateException if the port is not free or, in case of port 0, if there are no ports available at all.
+ * @return the port number itself if the port is free or, in case of port 0, the first available port number.
+ */
+ private static int probePort(int port) {
try (ServerSocket ss = new ServerSocket()) {
ss.setReuseAddress(true);
- ss.bind(new InetSocketAddress((InetAddress) null, 0), 1);
- int port = ss.getLocalPort();
- LOG.info("getNextAvailable() -> {}", port);
- return port;
+ ss.bind(new InetSocketAddress((InetAddress) null, port), 1);
+ int probedPort = ss.getLocalPort();
+ LOG.info("Available port is -> {}", probedPort);
+ return probedPort;
} catch (IOException e) {
throw new IllegalStateException("Cannot find free port", e);
}
}
+
}
diff --git a/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
new file mode 100644
index 0000000..ad6ed7c
--- /dev/null
+++ b/components/camel-test-junit5/src/main/java/org/apache/camel/test/AvailablePortFinderPropertiesFunction.java
@@ -0,0 +1,105 @@
+/*
+ * 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.test;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.camel.spi.PropertiesFunction;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
+
+/**
+ * A {@link PropertiesFunction} that reserves network ports and place them in a cache for reuse.
+ * <p/>
+ * The first time the function is invoked for a given name, an unused network port is determined and cached
+ * in an hash map with the given name as key so each time this function is invoked for the same name, the
+ * previously discovered port will be returned.
+ * <p/>
+ * This is useful for testing purpose where you can write a route like:
+ * <pre>{@code
+ * from("undertow:http://0.0.0.0:{{available-port:server-port}}")
+ * .to("mock:result");
+ * }</pre>
+ * And then you can invoke with {@link org.apache.camel.ProducerTemplate} like:
+ * <pre>{@code
+ * template.sendBody("undertow:http://0.0.0.0:{{available-port:server-port}}", "the body");
+ * }</pre>
+ * Doing so avoid the need to compute the port and pass it to the various method or store it as a global
+ * variable in the test class.
+ *
+ * @see AvailablePortFinder
+ */
+public class AvailablePortFinderPropertiesFunction implements PropertiesFunction {
+ private final Map<String, String> portMapping;
+
+ public AvailablePortFinderPropertiesFunction() {
+ this.portMapping = new ConcurrentHashMap<>();
+ }
+
+ @Override
+ public String getName() {
+ return "available-port";
+ }
+
+ @Override
+ public String apply(String remainder) {
+ if (ObjectHelper.isEmpty(remainder)) {
+ return remainder;
+ }
+
+ String name = StringHelper.before(remainder, ":");
+ String range = StringHelper.after(remainder, ":");
+
+ if (name == null) {
+ name = remainder;
+ }
+
+ final Integer from;
+ final Integer to;
+
+ if (range != null) {
+ String f = StringHelper.before(range, "-");
+ if (ObjectHelper.isEmpty(f)) {
+ throw new IllegalArgumentException("Unable to parse from range, range should be defined in the as from-to, got: " + range);
+ }
+
+ String t = StringHelper.after(range, "-");
+ if (ObjectHelper.isEmpty(t)) {
+ throw new IllegalArgumentException("Unable to parse to range, range should be defined in the as from-to, got: " + range);
+ }
+
+ from = Integer.parseInt(f);
+ to = Integer.parseInt(t);
+ } else {
+ from = null;
+ to = null;
+ }
+
+ return this.portMapping.computeIfAbsent(name, n -> {
+ final int port;
+
+ if (from != null && to != null) {
+ port = AvailablePortFinder.getNextAvailable(from, to);
+ } else {
+ port = AvailablePortFinder.getNextAvailable();
+ }
+
+ return Integer.toString(port);
+ });
+ }
+}
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index 98924d2..24a8b51 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -100,6 +100,21 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-spring-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-management</artifactId>
<scope>test</scope>
</dependency>
@@ -159,11 +174,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
index 95c3cef..9749e35 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
@@ -28,7 +28,10 @@ import org.apache.camel.component.zookeeper.NaturalSortComparator.Order;
import org.apache.camel.support.ExchangeHelper;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
public class ConsumeChildrenTest extends ZooKeeperTestSupport {
@@ -82,7 +85,7 @@ public class ConsumeChildrenTest extends ZooKeeperTestSupport {
for (int x = 0; x < received.size(); x++) {
Message zkm = mock.getReceivedExchanges().get(x).getIn();
int childCount = ((Stat)zkm.getHeader(ZooKeeperMessage.ZOOKEEPER_STATISTICS)).getNumChildren();
- assertNotSame("Num of children did not change", lastChildCount, childCount);
+ assertNotSame(lastChildCount, childCount, "Num of children did not change");
lastChildCount = childCount;
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
index f6afc16..5d8b9e5 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.zookeeper.KeeperException.NodeExistsException;
import org.apache.zookeeper.Watcher.Event.EventType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConsumeDataTest extends ZooKeeperTestSupport {
@@ -69,7 +72,7 @@ public class ConsumeDataTest extends ZooKeeperTestSupport {
if (!EventType.NodeDeleted.equals(expectedEventTypes[i])) {
// As a delete event does not carry statistics, ignore it in the version check.
int version = ZooKeeperMessage.getStatistics(mock.getExchanges().get(i).getIn()).getVersion();
- assertTrue("Version did not increase", lastVersion < version);
+ assertTrue(lastVersion < version, "Version did not increase");
lastVersion = version;
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
index f58af8a..e06a432 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/NaturalSortComparatorTest.java
@@ -22,9 +22,9 @@ import java.util.Collections;
import java.util.List;
import org.apache.camel.component.zookeeper.NaturalSortComparator.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class NaturalSortComparatorTest {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java
index b736152..854240b 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorHelperTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.zookeeper;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ZooKeeperCuratorHelperTest {
@@ -40,8 +40,8 @@ public class ZooKeeperCuratorHelperTest {
assertNotNull(curatorFramework);
ExponentialBackoffRetry retryPolicy = (ExponentialBackoffRetry) curatorFramework.getZookeeperClient().getRetryPolicy();
- assertEquals("retryPolicy.reconnectBaseSleepTime", configuration.getReconnectBaseSleepTime(), retryPolicy.getBaseSleepTimeMs());
- assertEquals("retryPolicy.reconnectMaxRetries", configuration.getReconnectMaxRetries(), retryPolicy.getN());
+ assertEquals(configuration.getReconnectBaseSleepTime(), retryPolicy.getBaseSleepTimeMs(), "retryPolicy.reconnectBaseSleepTime");
+ assertEquals(configuration.getReconnectMaxRetries(), retryPolicy.getN(), "retryPolicy.reconnectMaxRetries");
// retryPolicy.maxSleepMs not visible here
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
index d6d35a2..b863650 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
@@ -16,17 +16,19 @@
*/
package org.apache.camel.component.zookeeper;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ZooKeeperEndpointTest extends CamelTestSupport {
@Test
public void multipleZooKeeperServers() {
ZooKeeperEndpoint endpoint = context.getEndpoint("zookeeper:someserver1,someserver2:1234/zoo", ZooKeeperEndpoint.class);
- assertEquals("Get wrong number of servers", 2, endpoint.getConfiguration().getServers().size());
- assertEquals("The first server address is wrong", "someserver1", endpoint.getConfiguration().getServers().get(0));
- assertEquals("The second server address is wrong", "someserver2:1234", endpoint.getConfiguration().getServers().get(1));
+ assertEquals(2, endpoint.getConfiguration().getServers().size(), "Get wrong number of servers");
+ assertEquals("someserver1", endpoint.getConfiguration().getServers().get(0), "The first server address is wrong");
+ assertEquals("someserver2:1234", endpoint.getConfiguration().getServers().get(1), "The second server address is wrong");
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
index 2d775f5..c2eb292 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
@@ -23,9 +23,11 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.jmx.support.JmxUtils;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
@SuppressWarnings("all")
public class ZooKeeperManagedEndpointTest extends ZooKeeperTestSupport {
@Override
@@ -40,7 +42,7 @@ public class ZooKeeperManagedEndpointTest extends ZooKeeperTestSupport {
@Test
public void testEnpointConfigurationCanBeSetViaJMX() throws Exception {
Set s = getMBeanServer().queryNames(new ObjectName("org.apache.camel:type=endpoints,name=\"zookeeper:*\",*"), null);
- assertEquals("Could not find zookeper endpoint: " + s, 1, s.size());
+ assertEquals(1, s.size(), "Could not find zookeper endpoint: " + s);
ObjectName zepName = new ArrayList<ObjectName>(s).get(0);
verifyManagedAttribute(zepName, "Path", "/node");
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
index 509d203..a52e145 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperProducerTest.java
@@ -26,11 +26,14 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.zookeeper.operations.GetChildrenOperation;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.data.Stat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_CREATE_MODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_NODE;
import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_OPERATION;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ZooKeeperProducerTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
index 7e620d7..aaefbc0 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
@@ -23,7 +23,7 @@ import java.util.concurrent.CountDownLatch;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -36,6 +36,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class ZooKeeperTestSupport extends ContainerAwareTestSupport {
protected String testPayload = "This is a test";
protected byte[] testPayloadBytes = testPayload.getBytes();
@@ -161,7 +165,7 @@ public class ZooKeeperTestSupport extends ContainerAwareTestSupport {
for (int x = 0; x < received.size(); x++) {
Message zkm = mock.getReceivedExchanges().get(x).getIn();
int version = ZooKeeperMessage.getStatistics(zkm).getVersion();
- assertTrue("Version did not increase", lastVersion < version);
+ assertTrue(lastVersion < version, "Version did not increase");
lastVersion = version;
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
index 7362b4c..5b37abc 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperUtilsTest.java
@@ -21,12 +21,11 @@ import org.apache.camel.Message;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultMessage;
import org.apache.zookeeper.CreateMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getCreateMode;
import static org.apache.camel.component.zookeeper.ZooKeeperUtils.getCreateModeFromString;
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ZooKeeperUtilsTest {
private CamelContext camelContext = new DefaultCamelContext();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
index bee0fd6..21bc6c7 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.zookeeper;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooKeeper.States;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ZookeeperConnectionManagerTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java
index 622668a..6e81161 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/SpringZooKeeperServiceCallRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.test.AvailablePortFinderPropertiesFunction;
-import org.apache.camel.test.testcontainers.spring.ContainerAwareSpringTestSupport;
+import org.apache.camel.test.testcontainers.spring.junit5.ContainerAwareSpringTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -29,7 +29,7 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.testcontainers.containers.GenericContainer;
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
index 671e364..6d2a0d2 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceCallRouteTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -32,7 +32,7 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ZooKeeperServiceCallRouteTest extends CamelTestSupport {
private static final int SERVER_PORT = AvailablePortFinder.getNextAvailable();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java
index a61b92c..3c76701 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceDiscoveryTest.java
@@ -29,11 +29,10 @@ import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.curator.utils.CloseableUtils;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceInstance;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ZooKeeperServiceDiscoveryTest {
@@ -84,7 +83,7 @@ public class ZooKeeperServiceDiscoveryTest {
assertEquals(3, services.size());
for (ServiceDefinition service : services) {
- Assert.assertEquals(
+ assertEquals(
1,
instances.stream()
.filter(
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java
index 2dd5851..476a391 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cloud/ZooKeeperServiceRegistrationTestBase.java
@@ -25,7 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
@@ -34,8 +34,11 @@ import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
import org.apache.curator.x.discovery.ServiceInstance;
import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public abstract class ZooKeeperServiceRegistrationTestBase extends CamelTestSupport {
protected static final String SERVICE_ID = UUID.randomUUID().toString();
@@ -75,7 +78,7 @@ public abstract class ZooKeeperServiceRegistrationTestBase extends CamelTestSupp
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
index 53f2721..72d579f 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/SpringZooKeeperClusteredRouteConfigurationTest.java
@@ -18,11 +18,14 @@ package org.apache.camel.component.zookeeper.cluster;
import org.apache.camel.cluster.CamelClusterService;
import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SpringZooKeeperClusteredRouteConfigurationTest extends CamelSpringTestSupport {
@Test
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
index 6a4ece9..e2cbc2a 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyFactoryTest.java
@@ -30,11 +30,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class ZooKeeperClusteredRoutePolicyFactoryTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ZooKeeperClusteredRoutePolicyFactoryTest.class);
private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -62,8 +64,8 @@ public final class ZooKeeperClusteredRoutePolicyFactoryTest {
LATCH.await(1, TimeUnit.MINUTES);
SCHEDULER.shutdownNow();
- Assert.assertEquals(CLIENTS.size(), RESULTS.size());
- Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+ assertEquals(CLIENTS.size(), RESULTS.size());
+ assertTrue(RESULTS.containsAll(CLIENTS));
} finally {
if (container != null) {
container.stop();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
index 840332f..c32189a 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperClusteredRoutePolicyTest.java
@@ -30,11 +30,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class ZooKeeperClusteredRoutePolicyTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ZooKeeperClusteredRoutePolicyTest.class);
private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -62,8 +64,8 @@ public final class ZooKeeperClusteredRoutePolicyTest {
LATCH.await(1, TimeUnit.MINUTES);
SCHEDULER.shutdownNow();
- Assert.assertEquals(CLIENTS.size(), RESULTS.size());
- Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+ assertEquals(CLIENTS.size(), RESULTS.size());
+ assertTrue(RESULTS.containsAll(CLIENTS));
} finally {
if (container != null) {
container.stop();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
index cb195c5..e18f503 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/cluster/ZooKeeperMasterTest.java
@@ -29,11 +29,13 @@ import java.util.stream.IntStream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.zookeeper.ZooKeeperContainer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public final class ZooKeeperMasterTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ZooKeeperMasterTest.class);
private static final List<String> CLIENTS = IntStream.range(0, 3).mapToObj(Integer::toString).collect(Collectors.toList());
@@ -61,8 +63,8 @@ public final class ZooKeeperMasterTest {
LATCH.await(1, TimeUnit.MINUTES);
SCHEDULER.shutdownNow();
- Assert.assertEquals(CLIENTS.size(), RESULTS.size());
- Assert.assertTrue(RESULTS.containsAll(CLIENTS));
+ assertEquals(CLIENTS.size(), RESULTS.size());
+ assertTrue(RESULTS.containsAll(CLIENTS));
} finally {
if (container != null) {
container.stop();
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
index 2e24b32..69e93c6 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/AnyOfOperationTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class AnyOfOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
index 08911fe..f1a78d7 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ChildrenChangedOperationTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ChildrenChangedOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
index a0a3265..7e8ce74 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/CreateOperationTest.java
@@ -25,14 +25,17 @@ import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.ZooDefs.Perms;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.ACL;
-import org.junit.Before;
-import org.junit.Test;
+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.assertTrue;
public class CreateOperationTest extends ZooKeeperTestSupport {
private ZooKeeper connection;
- @Before
+ @BeforeEach
public void setupConnection() {
connection = getConnection();
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
index d2e752d..8e94cb5 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/DataChangedOperationTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class DataChangedOperationTest extends ZooKeeperTestSupport {
@@ -43,6 +46,6 @@ public class DataChangedOperationTest extends ZooKeeperTestSupport {
connection.getData("/existedButWasDeleted", future, null);
client.delete("/existedButWasDeleted");
- assertEquals(null, future.get().getResult());
+ assertNull(future.get().getResult());
}
}
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java
index 79303ac..36f3cf7 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceChangedOperationTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ExistenceChangedOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java
index 74f68af..43334ef 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/ExistenceOperationTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ExistenceOperationTest extends ZooKeeperTestSupport {
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
index 3f0fcd0..b0b6472 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/FutureEventDrivenOperationTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.data.Stat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class FutureEventDrivenOperationTest {
private String data = "Event Received";
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
index 53278a9..4bf9c15 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/operations/SetDataOperationTest.java
@@ -18,14 +18,16 @@ package org.apache.camel.component.zookeeper.operations;
import org.apache.camel.component.zookeeper.ZooKeeperTestSupport;
import org.apache.zookeeper.ZooKeeper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SetDataOperationTest extends ZooKeeperTestSupport {
private ZooKeeper connection;
- @Before
+ @BeforeEach
public void setupConnection() {
connection = getConnection();
}