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/22 16:59:09 UTC
[camel] 03/18: [CAMEL-11807] Upgrade camel-leveldb 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 831414df0142701e10af0c46ba70dcebfa5f801a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 22 13:45:17 2020 +0200
[CAMEL-11807] Upgrade camel-leveldb to junit5
---
components/camel-leveldb/leveldb.dat/CURRENT | 1 +
components/camel-leveldb/leveldb.dat/LOCK | 0
components/camel-leveldb/leveldb.dat/LOG | 3 +++
components/camel-leveldb/leveldb.dat/LOG.old | 1 +
.../camel-leveldb/leveldb.dat/MANIFEST-000004 | Bin 0 -> 50 bytes
components/camel-leveldb/pom.xml | 6 ++---
...elDBAggregateConcurrentDifferentGroupsTest.java | 10 +++++----
.../LevelDBAggregateConcurrentSameGroupTest.java | 10 +++++----
.../LevelDBAggregateDiscardOnTimeoutTest.java | 10 +++++----
.../LevelDBAggregateForceCompletionHeaderTest.java | 10 +++++----
.../LevelDBAggregateLoadAndRecoverTest.java | 16 ++++++++-----
.../LevelDBAggregateLoadConcurrentTest.java | 10 +++++----
.../leveldb/LevelDBAggregateLoadTest.java | 10 +++++----
...DBAggregateNotLostRemovedWhenConfirmedTest.java | 10 +++++----
.../leveldb/LevelDBAggregateNotLostTest.java | 11 +++++----
...ggregateRecoverDeadLetterChannelFailedTest.java | 11 +++++----
...velDBAggregateRecoverDeadLetterChannelTest.java | 10 +++++----
.../leveldb/LevelDBAggregateRecoverTest.java | 10 +++++----
...DBAggregateRecoverWithRedeliveryPolicyTest.java | 10 +++++----
.../LevelDBAggregateRecoverWithSedaTest.java | 10 +++++----
.../LevelDBAggregateSerializedHeadersTest.java | 10 +++++----
.../component/leveldb/LevelDBAggregateTest.java | 11 +++++----
...velDBAggregateTimeoutCompletionRestartTest.java | 11 +++++----
.../LevelDBAggregationRepositoryAlotDataTest.java | 15 ++++++++-----
...velDBAggregationRepositoryLoadExistingTest.java | 15 ++++++++-----
...velDBAggregationRepositoryMultipleRepoTest.java | 15 ++++++++-----
...DBAggregationRepositoryRecoverExistingTest.java | 13 +++++++----
.../leveldb/LevelDBAggregationRepositoryTest.java | 15 ++++++++-----
.../component/leveldb/LevelDBBigPayloadTest.java | 22 +++++++++++-------
.../leveldb/LevelDBExchangeSerializationTest.java | 18 ++++++++++-----
.../component/leveldb/LevelDBGetNotFoundTest.java | 25 +++++++++++++--------
.../camel/component/leveldb/LevelDBSetupTest.java | 6 +++--
...ngAggregateRecoverWithRedeliveryPolicyTest.java | 10 +++++----
.../leveldb/LevelDBSpringAggregateTest.java | 10 +++++----
34 files changed, 221 insertions(+), 134 deletions(-)
diff --git a/components/camel-leveldb/leveldb.dat/CURRENT b/components/camel-leveldb/leveldb.dat/CURRENT
new file mode 100644
index 0000000..cacca75
--- /dev/null
+++ b/components/camel-leveldb/leveldb.dat/CURRENT
@@ -0,0 +1 @@
+MANIFEST-000004
diff --git a/components/camel-leveldb/leveldb.dat/LOCK b/components/camel-leveldb/leveldb.dat/LOCK
new file mode 100644
index 0000000..e69de29
diff --git a/components/camel-leveldb/leveldb.dat/LOG b/components/camel-leveldb/leveldb.dat/LOG
new file mode 100644
index 0000000..a98a285
--- /dev/null
+++ b/components/camel-leveldb/leveldb.dat/LOG
@@ -0,0 +1,3 @@
+2020/07/22-13:45:01.675407 7000081c8000 Recovering log #3
+2020/07/22-13:45:01.676537 7000081c8000 Delete type=0 #3
+2020/07/22-13:45:01.676619 7000081c8000 Delete type=3 #2
diff --git a/components/camel-leveldb/leveldb.dat/LOG.old b/components/camel-leveldb/leveldb.dat/LOG.old
new file mode 100644
index 0000000..de3c694
--- /dev/null
+++ b/components/camel-leveldb/leveldb.dat/LOG.old
@@ -0,0 +1 @@
+2020/07/22-13:44:04.733946 7000100ae000 Delete type=3 #1
diff --git a/components/camel-leveldb/leveldb.dat/MANIFEST-000004 b/components/camel-leveldb/leveldb.dat/MANIFEST-000004
new file mode 100644
index 0000000..0a6e923
Binary files /dev/null and b/components/camel-leveldb/leveldb.dat/MANIFEST-000004 differ
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 099d697..0d061cf 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -72,7 +72,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -81,8 +81,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java
index 66f2789..83753ec 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentDifferentGroupsTest.java
@@ -24,14 +24,16 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateConcurrentDifferentGroupsTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java
index 83df9ef..c2cb1d6 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateConcurrentSameGroupTest.java
@@ -24,14 +24,16 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateConcurrentSameGroupTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java
index 23acdee..3e341eb 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateDiscardOnTimeoutTest.java
@@ -22,16 +22,18 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateDiscardOnTimeoutTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
index 3c2f744..7c82b9a 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateForceCompletionHeaderTest.java
@@ -22,9 +22,11 @@ import java.util.Map;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* To test CAMEL-4118 support for completing all aggregation groups with a signal message
@@ -32,7 +34,7 @@ import org.junit.Test;
public class LevelDBAggregateForceCompletionHeaderTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
index ec1f68f..cb2b1b0 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadAndRecoverTest.java
@@ -25,19 +25,23 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class LevelDBAggregateLoadAndRecoverTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(LevelDBAggregateLoadAndRecoverTest.class);
private static final int SIZE = 200;
private static AtomicInteger counter = new AtomicInteger();
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
deleteDirectory("target/data");
@@ -77,9 +81,9 @@ public class LevelDBAggregateLoadAndRecoverTest extends CamelTestSupport {
int expected = SIZE / 10 / 10;
int delta = Math.abs(expected - recovered);
if (delta == 0) {
- assertEquals("There should be " + expected + " recovered", expected, recovered);
+ assertEquals(expected, recovered, "There should be " + expected + " recovered");
} else {
- assertTrue("We expected " + expected + " recovered but the delta is within accepted range " + delta, delta < 3);
+ assertTrue(delta < 3, "We expected " + expected + " recovered but the delta is within accepted range " + delta);
}
}
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java
index 5f5cc3f..94f436d 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadConcurrentTest.java
@@ -24,19 +24,21 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public class LevelDBAggregateLoadConcurrentTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(LevelDBAggregateLoadConcurrentTest.class);
private static final char[] KEYS = new char[]{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'};
private static final int SIZE = 500;
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
deleteDirectory("target/data");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java
index 9adb2fa..e4cdc8e 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateLoadTest.java
@@ -20,19 +20,21 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public class LevelDBAggregateLoadTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(LevelDBAggregateLoadTest.class);
private static final int SIZE = 500;
private LevelDBAggregationRepository repo;
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
deleteDirectory("target/data");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
index 699356f..81e0f8d 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostRemovedWhenConfirmedTest.java
@@ -21,18 +21,20 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.leveldb.LevelDBAggregationRepository.keyBuilder;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class LevelDBAggregateNotLostRemovedWhenConfirmedTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java
index 32d5fef..167131b 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateNotLostTest.java
@@ -21,19 +21,22 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.fusesource.hawtbuf.Buffer;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.component.leveldb.LevelDBAggregationRepository.keyBuilder;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class LevelDBAggregateNotLostTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java
index 509efa4..a48326a 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelFailedTest.java
@@ -21,16 +21,19 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregateRecoverDeadLetterChannelFailedTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java
index 951c667..dba74e1 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverDeadLetterChannelTest.java
@@ -21,16 +21,18 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateRecoverDeadLetterChannelTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java
index ceb0e0f..b153fa1 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateRecoverTest extends CamelTestSupport {
@@ -33,7 +35,7 @@ public class LevelDBAggregateRecoverTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
index 6b4e5ef..fc584a3 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithRedeliveryPolicyTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends CamelTestSupport {
@@ -33,7 +35,7 @@ public class LevelDBAggregateRecoverWithRedeliveryPolicyTest extends CamelTestSu
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java
index 2574924..2be4a85 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateRecoverWithSedaTest.java
@@ -23,9 +23,11 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBAggregateRecoverWithSedaTest extends CamelTestSupport {
@@ -33,7 +35,7 @@ public class LevelDBAggregateRecoverWithSedaTest extends CamelTestSupport {
private LevelDBAggregationRepository repo;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
repo = new LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
index e208f1c..e25fe29 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateSerializedHeadersTest.java
@@ -24,19 +24,21 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.util.HeaderDto;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public class LevelDBAggregateSerializedHeadersTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(LevelDBAggregateSerializedHeadersTest.class);
private static final int SIZE = 500;
private LevelDBAggregationRepository repo;
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
deleteDirectory("target/data");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java
index e789f82..a756afe 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTest.java
@@ -22,14 +22,17 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregateTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java
index d65972c..35c23a8 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregateTimeoutCompletionRestartTest.java
@@ -20,14 +20,17 @@ import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregateTimeoutCompletionRestartTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java
index 80a11d5..e746f19 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryAlotDataTest.java
@@ -20,17 +20,20 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregationRepositoryAlotDataTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
@@ -41,7 +44,7 @@ public class LevelDBAggregationRepositoryAlotDataTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
levelDBFile.stop();
super.tearDown();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java
index 78af780..aecb2b7 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryLoadExistingTest.java
@@ -20,17 +20,20 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregationRepositoryLoadExistingTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
@@ -41,7 +44,7 @@ public class LevelDBAggregationRepositoryLoadExistingTest extends CamelTestSuppo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
levelDBFile.stop();
super.tearDown();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java
index 95bbed0..5b41e19 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryMultipleRepoTest.java
@@ -20,17 +20,20 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregationRepositoryMultipleRepoTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
@@ -41,7 +44,7 @@ public class LevelDBAggregationRepositoryMultipleRepoTest extends CamelTestSuppo
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
levelDBFile.stop();
super.tearDown();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java
index 3e57ea0..b23aa20 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryRecoverExistingTest.java
@@ -20,16 +20,21 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+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 LevelDBAggregationRepositoryRecoverExistingTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java
index 2af9689..1ce4c5e 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBAggregationRepositoryTest.java
@@ -20,17 +20,20 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LevelDBAggregationRepositoryTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
@@ -41,7 +44,7 @@ public class LevelDBAggregationRepositoryTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
levelDBFile.stop();
super.tearDown();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
index a67cd37..8d2fdf7 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBBigPayloadTest.java
@@ -21,22 +21,28 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test issue with leveldb file store growing to large
*/
-@Ignore("Run this test manually")
+@Disabled("Run this test manually")
public class LevelDBBigPayloadTest extends CamelTestSupport {
private static final long TIME = 60 * 1000;
private static final AtomicLong NUMBER = new AtomicLong();
private LevelDBAggregationRepository repo;
+ private Logger log = LoggerFactory.getLogger(getClass());
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
deleteDirectory("target/data");
@@ -52,11 +58,11 @@ public class LevelDBBigPayloadTest extends CamelTestSupport {
// assert the file size of the repo is not big < 32mb
File file = new File("target/data/leveldb.dat");
- assertTrue(file + " should exists", file.exists());
+ assertTrue(file.exists(), file + " should exists");
long size = file.length();
log.info(file + " size is " + size);
// should be about 32mb, so we say 34 just in case
- assertTrue(file + " should not be so big in size, was: " + size, size < 34 * 1024 * 1024);
+ assertTrue(size < 34 * 1024 * 1024, file + " should not be so big in size, was: " + size);
}
@Override
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java
index e5ba977..de33ff7 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBExchangeSerializationTest.java
@@ -21,17 +21,23 @@ import java.util.Date;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class LevelDBExchangeSerializationTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
@@ -42,7 +48,7 @@ public class LevelDBExchangeSerializationTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
levelDBFile.stop();
super.tearDown();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java
index 2de1974..fbe8c96 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBGetNotFoundTest.java
@@ -20,17 +20,24 @@ import java.io.File;
import org.apache.camel.Exchange;
import org.apache.camel.support.DefaultExchange;
-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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class LevelDBGetNotFoundTest extends CamelTestSupport {
private LevelDBFile levelDBFile;
+ private Logger log = LoggerFactory.getLogger(getClass());
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
deleteDirectory("target/data");
@@ -41,7 +48,7 @@ public class LevelDBGetNotFoundTest extends CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
levelDBFile.stop();
super.tearDown();
@@ -57,7 +64,7 @@ public class LevelDBGetNotFoundTest extends CamelTestSupport {
exchange.getIn().setBody("Hello World");
Exchange out = repo.get(context, exchange.getExchangeId());
- assertNull("Should not find exchange", out);
+ assertNull(out, "Should not find exchange");
}
@Test
@@ -72,14 +79,14 @@ public class LevelDBGetNotFoundTest extends CamelTestSupport {
repo.add(context, exchange.getExchangeId(), exchange);
Exchange out = repo.get(context, exchange.getExchangeId());
- assertNotNull("Should find exchange", out);
+ assertNotNull(out, "Should find exchange");
Exchange exchange2 = new DefaultExchange(context);
exchange2.getIn().setBody("Bye World");
log.info("Created " + exchange2.getExchangeId());
Exchange out2 = repo.get(context, exchange2.getExchangeId());
- assertNull("Should not find exchange", out2);
+ assertNull(out2, "Should not find exchange");
}
}
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java
index 6e1e4c3..d4a0474 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSetupTest.java
@@ -17,8 +17,10 @@
package org.apache.camel.component.leveldb;
-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.apache.camel.test.junit5.TestSupport.deleteDirectory;
public class LevelDBSetupTest extends CamelTestSupport {
/**
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
index 9bc026f..4206e1f 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest.java
@@ -22,12 +22,14 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public class LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest extends CamelSpringTestSupport {
private static AtomicInteger counter = new AtomicInteger(0);
@@ -38,7 +40,7 @@ public class LevelDBSpringAggregateRecoverWithRedeliveryPolicyTest extends Camel
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();
diff --git a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java
index 1898ba0..0da6dab 100644
--- a/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java
+++ b/components/camel-leveldb/src/test/java/org/apache/camel/component/leveldb/LevelDBSpringAggregateTest.java
@@ -21,16 +21,18 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
public class LevelDBSpringAggregateTest extends CamelSpringTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data");
super.setUp();