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:56 UTC
[camel] 09/43: [CAMEL-11807] Upgrade camel-zookeeper-master 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 fc1a1406759ae695127ff223be5e32bd73d5731c
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jul 27 12:09:02 2020 +0200
[CAMEL-11807] Upgrade camel-zookeeper-master to junit5
---
components/camel-zookeeper-master/pom.xml | 10 +++++++
.../MasterEndpointFailoverTest.java | 10 +++----
.../zookeepermaster/MasterEndpointTest.java | 13 ++++----
.../zookeepermaster/MasterQuartzEndpointTest.java | 6 ++--
.../component/zookeepermaster/group/GroupTest.java | 35 +++++++++++-----------
.../group/internal/ZooKeeperGroupTest.java | 12 ++++----
6 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index f4e4104..eb06999 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -117,6 +117,16 @@
<!-- 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-quartz</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
index c5d7072..72f8a83 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
@@ -25,9 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
import org.apache.curator.framework.CuratorFramework;
-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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@ public class MasterEndpointFailoverTest {
protected ZKContainer zkContainer = new ZKContainer();
protected CuratorFactoryBean zkClientBean = new CuratorFactoryBean();
- @Before
+ @BeforeEach
public void beforeRun() throws Exception {
zkContainer.start();
@@ -93,7 +93,7 @@ public class MasterEndpointFailoverTest {
result2Endpoint = consumerContext2.getEndpoint("mock:result2", MockEndpoint.class);
}
- @After
+ @AfterEach
public void afterRun() throws Exception {
consumerContext1.stop();
consumerContext2.stop();
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
index eba3ee5..af8343d 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
@@ -26,15 +26,16 @@ import org.apache.camel.Route;
import org.apache.camel.component.file.remote.SftpEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+@CamelSpringTest
@ContextConfiguration
-public class MasterEndpointTest extends AbstractJUnit4SpringContextTests {
+public class MasterEndpointTest {
@Autowired
protected CamelContext camelContext;
@@ -48,9 +49,9 @@ public class MasterEndpointTest extends AbstractJUnit4SpringContextTests {
public void testEndpoint() throws Exception {
// check the endpoint configuration
List<Route> registeredRoutes = camelContext.getRoutes();
- assertEquals("number of routes", 1, registeredRoutes.size());
+ assertEquals(1, registeredRoutes.size(), "number of routes");
MasterEndpoint endpoint = (MasterEndpoint) registeredRoutes.get(0).getEndpoint();
- assertEquals("wrong endpoint uri", "seda:bar", endpoint.getConsumerEndpointUri());
+ assertEquals("seda:bar", endpoint.getConsumerEndpointUri(), "wrong endpoint uri");
String expectedBody = "<matched/>";
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
index ee7941d..7ba6cde 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterQuartzEndpointTest.java
@@ -19,13 +19,15 @@ package org.apache.camel.component.zookeepermaster;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+@CamelSpringTest
@ContextConfiguration
-public class MasterQuartzEndpointTest extends AbstractJUnit4SpringContextTests {
+public class MasterQuartzEndpointTest {
@Autowired
protected CamelContext camelContext;
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
index b5ea05e..3fb14a0 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/GroupTest.java
@@ -28,22 +28,21 @@ import org.apache.camel.component.zookeepermaster.ZKContainer;
import org.apache.camel.component.zookeepermaster.group.internal.ChildData;
import org.apache.camel.component.zookeepermaster.group.internal.ZooKeeperGroup;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryNTimes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.SelinuxContext;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.springframework.test.util.AssertionErrors.assertNotEquals;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class GroupTest {
private static final Logger LOGGER = LoggerFactory.getLogger(GroupTest.class);
@@ -99,13 +98,13 @@ public class GroupTest {
return container;
}
- @BeforeClass
+ @BeforeAll
public static void before() {
// workaround macos issue with docker/testcontainers expecting to use /tmp/ folder
beforeTmpdir = System.setProperty("java.io.tmpdir", "/tmp/");
}
- @AfterClass
+ @AfterAll
public static void after() {
if (beforeTmpdir != null) {
System.setProperty("java.io.tmpdir", beforeTmpdir);
@@ -164,13 +163,13 @@ public class GroupTest {
}
curator.close();
- assertTrue("first started is master", firsStartedIsMaster);
+ assertTrue(firsStartedIsMaster, "first started is master");
} finally {
if (container != null) {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -218,7 +217,7 @@ public class GroupTest {
}
try {
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
} catch (Throwable e) {
// ignore
}
@@ -264,7 +263,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -320,7 +319,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -369,7 +368,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
@@ -423,7 +422,7 @@ public class GroupTest {
TimeUnit.SECONDS.sleep(1);
}
- assertNotEquals("We see the updated version", version, group.getCurrentData().get(0).getStat().getVersion());
+ assertNotEquals(version, group.getCurrentData().get(0).getStat().getVersion(), "We see the updated version");
LOGGER.info("CurrentData:" + group.getCurrentData());
@@ -434,7 +433,7 @@ public class GroupTest {
container.stop();
}
- CamelTestSupport.deleteDirectory(dataDir.toFile());
+ deleteDirectory(dataDir.toFile());
}
}
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
index e1723f8..754702f 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/group/internal/ZooKeeperGroupTest.java
@@ -29,13 +29,13 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryOneTime;
import org.apache.zookeeper.data.Stat;
-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.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class ZooKeeperGroupTest {
@@ -48,7 +48,7 @@ public class ZooKeeperGroupTest {
return AvailablePortFinder.getNextAvailable();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
int port = findFreePort();
curator = CuratorFrameworkFactory.builder()
@@ -61,7 +61,7 @@ public class ZooKeeperGroupTest {
// Starting curator and group is not necessary for the current tests.
}
- @After
+ @AfterEach
public void tearDown() throws IOException {
group.close();
curator.close();