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/15 17:11:30 UTC
[camel] 01/14: [CAMEL-11807] Upgrade camel-nitrite 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 0d742b8432dcfbe7e21d6e2789f1781da0dbfecc
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 10 11:27:36 2020 +0200
[CAMEL-11807] Upgrade camel-nitrite to junit5
---
components/camel-nitrite/pom.xml | 2 +-
.../component/nitrite/AbstractNitriteTest.java | 18 +++++--
.../component/nitrite/NitriteComponentTest.java | 2 +-
.../nitrite/NitriteConsumerCollectionTest.java | 56 +++++++++++-----------
.../nitrite/NitriteConsumerRepositoryTest.java | 50 +++++++++----------
.../nitrite/NitriteProducerCollectionTest.java | 49 ++++++++++---------
.../nitrite/NitriteProducerRepositoryTest.java | 41 ++++++++--------
7 files changed, 120 insertions(+), 98 deletions(-)
diff --git a/components/camel-nitrite/pom.xml b/components/camel-nitrite/pom.xml
index 655ed4c..e3f2f28 100644
--- a/components/camel-nitrite/pom.xml
+++ b/components/camel-nitrite/pom.xml
@@ -53,7 +53,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java
index 788b84d..37a82a3 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/AbstractNitriteTest.java
@@ -17,14 +17,20 @@
package org.apache.camel.component.nitrite;
import java.io.File;
+import java.lang.reflect.Method;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.camel.Exchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.FileUtil;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class AbstractNitriteTest extends CamelTestSupport implements BeforeEachCallback {
+
+ protected String testMethodName;
-public class AbstractNitriteTest extends CamelTestSupport {
@Override
protected void doPreSetup() throws Exception {
@@ -32,8 +38,14 @@ public class AbstractNitriteTest extends CamelTestSupport {
FileUtil.deleteFile(new File(tempDb()));
}
+ @Override
+ public void beforeEach(ExtensionContext context) throws Exception {
+ testMethodName = context.getTestMethod().map(Method::getName).orElse("unknown");
+ super.beforeEach(context);
+ }
+
protected String tempDb() {
- return "target/" + getClass().getSimpleName() + "_" + getTestMethodName() + ".db";
+ return "target/" + getClass().getSimpleName() + "_" + testMethodName + ".db";
}
protected List<Exchange> sortByChangeTimestamp(List<Exchange> input) {
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteComponentTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteComponentTest.java
index a9b6a75..52e50bd 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteComponentTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteComponentTest.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.FileUtil;
import org.dizitart.no2.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class NitriteComponentTest extends AbstractNitriteTest {
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerCollectionTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerCollectionTest.java
index 03f2eb9..0aa9076 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerCollectionTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerCollectionTest.java
@@ -28,8 +28,10 @@ import org.apache.camel.component.nitrite.operation.common.InsertOperation;
import org.dizitart.no2.Document;
import org.dizitart.no2.event.ChangeType;
import org.dizitart.no2.filters.Filters;
-import org.junit.Assert;
-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;
public class NitriteConsumerCollectionTest extends AbstractNitriteTest {
@@ -51,16 +53,16 @@ public class NitriteConsumerCollectionTest extends AbstractNitriteTest {
Exchange change1 = sorted.get(0);
Exchange change2 = sorted.get(1);
- Assert.assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertEquals(ChangeType.INSERT, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertEquals("value1", change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
- Assert.assertEquals("value2", change2.getMessage().getBody(Map.class).get("key2"));
+ assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
+ assertEquals("value1", change1.getMessage().getBody(Map.class).get("key1"));
+ assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
+ assertEquals("value2", change2.getMessage().getBody(Map.class).get("key2"));
}
@Test
@@ -80,16 +82,16 @@ public class NitriteConsumerCollectionTest extends AbstractNitriteTest {
Exchange change1 = sorted.get(0);
Exchange change2 = sorted.get(1);
- Assert.assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertEquals(ChangeType.UPDATE, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.UPDATE, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertEquals("value1", change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
- Assert.assertEquals("value2", change2.getMessage().getBody(Map.class).get("key2"));
+ assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
+ assertEquals("value1", change1.getMessage().getBody(Map.class).get("key1"));
+ assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
+ assertEquals("value2", change2.getMessage().getBody(Map.class).get("key2"));
}
@Test
@@ -106,12 +108,12 @@ public class NitriteConsumerCollectionTest extends AbstractNitriteTest {
Exchange change1 = mock.getExchanges().get(0);
- Assert.assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertEquals("value1", change1.getMessage().getBody(Map.class).get("key1"));
+ assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
+ assertEquals("value1", change1.getMessage().getBody(Map.class).get("key1"));
}
@Test
@@ -128,7 +130,7 @@ public class NitriteConsumerCollectionTest extends AbstractNitriteTest {
NitriteConstants.OPERATION, new RemoveCollectionOperation(Filters.eq("key1", "value1"))
);
- Assert.assertEquals(
+ assertEquals(
0,
template.requestBody("direct:listAll", null, List.class).size()
);
@@ -139,11 +141,11 @@ public class NitriteConsumerCollectionTest extends AbstractNitriteTest {
Exchange insert = sorted.get(0);
Exchange remove = sorted.get(1);
- Assert.assertEquals(ChangeType.INSERT, insert.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertEquals(ChangeType.REMOVE, remove.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, insert.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.REMOVE, remove.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(insert.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(remove.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(insert.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(remove.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
}
@Override
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerRepositoryTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerRepositoryTest.java
index 1f33e6b..eaf00b4 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerRepositoryTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteConsumerRepositoryTest.java
@@ -27,8 +27,10 @@ import org.apache.camel.component.nitrite.operation.repository.FindRepositoryOpe
import org.apache.camel.component.nitrite.operation.repository.RemoveRepositoryOperation;
import org.dizitart.no2.event.ChangeType;
import org.dizitart.no2.objects.filters.ObjectFilters;
-import org.junit.Assert;
-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;
public class NitriteConsumerRepositoryTest extends AbstractNitriteTest {
@@ -50,16 +52,16 @@ public class NitriteConsumerRepositoryTest extends AbstractNitriteTest {
Exchange change1 = sorted.get(0);
Exchange change2 = sorted.get(1);
- Assert.assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertEquals(ChangeType.INSERT, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertEquals("val1", change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
- Assert.assertEquals("val4", change2.getMessage().getBody(Map.class).get("key2"));
+ assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
+ assertEquals("val1", change1.getMessage().getBody(Map.class).get("key1"));
+ assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
+ assertEquals("val4", change2.getMessage().getBody(Map.class).get("key2"));
}
@Test
@@ -76,7 +78,7 @@ public class NitriteConsumerRepositoryTest extends AbstractNitriteTest {
mock.assertIsSatisfied();
- Assert.assertEquals(
+ assertEquals(
1,
template.requestBody("direct:listAll", null, List.class).size()
);
@@ -85,16 +87,16 @@ public class NitriteConsumerRepositoryTest extends AbstractNitriteTest {
Exchange change1 = sorted.get(0);
Exchange change2 = sorted.get(1);
- Assert.assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertEquals(ChangeType.UPDATE, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, change1.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.UPDATE, change2.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change1.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(change2.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertEquals("val1", change1.getMessage().getBody(Map.class).get("key1"));
- Assert.assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
- Assert.assertEquals("val4", change2.getMessage().getBody(Map.class).get("key2"));
+ assertNotNull(change1.getMessage().getBody(Map.class).get("key1"));
+ assertEquals("val1", change1.getMessage().getBody(Map.class).get("key1"));
+ assertNotNull(change2.getMessage().getBody(Map.class).get("key2"));
+ assertEquals("val4", change2.getMessage().getBody(Map.class).get("key2"));
}
@Test
@@ -111,7 +113,7 @@ public class NitriteConsumerRepositoryTest extends AbstractNitriteTest {
NitriteConstants.OPERATION, new RemoveRepositoryOperation(ObjectFilters.eq("key1", "val1"))
);
- Assert.assertEquals(
+ assertEquals(
0,
template.requestBody("direct:listAll", null, List.class).size()
);
@@ -122,11 +124,11 @@ public class NitriteConsumerRepositoryTest extends AbstractNitriteTest {
Exchange insert = sorted.get(0);
Exchange remove = sorted.get(1);
- Assert.assertEquals(ChangeType.INSERT, insert.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertEquals(ChangeType.REMOVE, remove.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.INSERT, insert.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
+ assertEquals(ChangeType.REMOVE, remove.getMessage().getHeader(NitriteConstants.CHANGE_TYPE));
- Assert.assertNotNull(insert.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
- Assert.assertNotNull(remove.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(insert.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
+ assertNotNull(remove.getMessage().getHeader(NitriteConstants.CHANGE_TIMESTAMP));
}
@Override
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerCollectionTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerCollectionTest.java
index 8562385..c66e8c1 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerCollectionTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerCollectionTest.java
@@ -44,13 +44,16 @@ import org.dizitart.no2.NitriteId;
import org.dizitart.no2.WriteResult;
import org.dizitart.no2.filters.Filters;
import org.dizitart.no2.meta.Attributes;
-import org.junit.Assert;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NitriteProducerCollectionTest extends AbstractNitriteTest {
- @Before
+ @BeforeEach
public void insertData() {
template.sendBody(String.format("nitrite://%s?collection=collection", tempDb()),
Document.createDocument("key1", "value1-a").put("key2", "value2-a").put("key3", "value3-a").put("_id", 1L)
@@ -72,10 +75,10 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
List.class
);
- Assert.assertEquals(1, result.size());
- Assert.assertEquals("value1-a", result.get(0).get("key1"));
- Assert.assertEquals("value2-a", result.get(0).get("key2"));
- Assert.assertEquals("value3-a", result.get(0).get("key3"));
+ assertEquals(1, result.size());
+ assertEquals("value1-a", result.get(0).get("key1"));
+ assertEquals("value2-a", result.get(0).get("key2"));
+ assertEquals("value3-a", result.get(0).get("key3"));
}
@Test
@@ -84,7 +87,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
exchange.getMessage().setHeader(NitriteConstants.OPERATION, new RemoveCollectionOperation(Filters.eq("key2", "value2-b")));
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -97,7 +100,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
exchange.getMessage().setBody(Document.createDocument("key3", "updatedValue"));
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -114,7 +117,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
listIndices.getMessage().setHeader(NitriteConstants.OPERATION, new ListIndicesOperation());
template.send(String.format("nitrite://%s?collection=collection", tempDb()), listIndices);
- Assert.assertEquals(1, listIndices.getMessage().getBody(List.class).size());
+ assertEquals(1, listIndices.getMessage().getBody(List.class).size());
}
@Test
@@ -129,7 +132,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
listIndices.getMessage().setHeader(NitriteConstants.OPERATION, new ListIndicesOperation());
template.send(String.format("nitrite://%s?collection=collection", tempDb()), listIndices);
- Assert.assertEquals(0, listIndices.getMessage().getBody(List.class).size());
+ assertEquals(0, listIndices.getMessage().getBody(List.class).size());
}
@Test
@@ -138,7 +141,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
exchange.getMessage().setHeader(NitriteConstants.OPERATION, new GetAttributesOperation());
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertNotNull(exchange.getMessage().getBody(Attributes.class));
+ assertNotNull(exchange.getMessage().getBody(Attributes.class));
}
@Test
@@ -147,7 +150,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
exchange.getMessage().setHeader(NitriteConstants.OPERATION, new GetByIdOperation(NitriteId.createId(1L)));
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertNotNull(exchange.getMessage().getBody(Document.class));
+ assertNotNull(exchange.getMessage().getBody(Document.class));
}
@Test
@@ -158,7 +161,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
));
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -172,7 +175,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
listIndices.getMessage().setHeader(NitriteConstants.OPERATION, new ListIndicesOperation());
template.send(String.format("nitrite://%s?collection=collection", tempDb()), listIndices);
- Assert.assertEquals(1, listIndices.getMessage().getBody(List.class).size());
+ assertEquals(1, listIndices.getMessage().getBody(List.class).size());
}
@Test
@@ -195,7 +198,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
));
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -209,7 +212,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
));
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -225,7 +228,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
byte[].class
);
- Assert.assertNotNull(ddl);
+ assertNotNull(ddl);
template.sendBodyAndHeader(
String.format("nitrite://%s?collection=collection", tempDb() + "clone"),
@@ -233,7 +236,7 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
NitriteConstants.OPERATION, new ImportDatabaseOperation()
);
- Assert.assertEquals(3,
+ assertEquals(3,
template.requestBodyAndHeader(
String.format("nitrite://%s?collection=collection", tempDb() + "clone"),
null,
@@ -250,9 +253,9 @@ public class NitriteProducerCollectionTest extends AbstractNitriteTest {
template.send(String.format("nitrite://%s?collection=collection", tempDb()), exchange);
- Assert.assertTrue(
- String.format("Expected exception of type IllegalArgumentException, %s given", exchange.getException()),
- exchange.getException() instanceof IllegalArgumentException
+ assertTrue(
+ exchange.getException() instanceof IllegalArgumentException,
+ String.format("Expected exception of type IllegalArgumentException, %s given", exchange.getException())
);
}
}
diff --git a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerRepositoryTest.java b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerRepositoryTest.java
index cbec82b..ebf3068 100644
--- a/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerRepositoryTest.java
+++ b/components/camel-nitrite/src/test/java/org/apache/camel/component/nitrite/NitriteProducerRepositoryTest.java
@@ -37,13 +37,16 @@ import org.dizitart.no2.IndexType;
import org.dizitart.no2.WriteResult;
import org.dizitart.no2.meta.Attributes;
import org.dizitart.no2.objects.filters.ObjectFilters;
-import org.junit.Assert;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
- @Before
+ @BeforeEach
public void insertData() {
template.sendBody(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()),
new MyPersistentObject(1, "a", "b", "")
@@ -65,9 +68,9 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
List.class
);
- Assert.assertEquals(1, result.size());
- Assert.assertEquals("c", result.get(0).getKey1());
- Assert.assertEquals("d", result.get(0).getKey2());
+ assertEquals(1, result.size());
+ assertEquals("c", result.get(0).getKey1());
+ assertEquals("d", result.get(0).getKey2());
}
@Test
@@ -76,7 +79,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
exchange.getMessage().setHeader(NitriteConstants.OPERATION, new RemoveRepositoryOperation(ObjectFilters.eq("key2", "b")));
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -89,7 +92,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
exchange.getMessage().setBody(new MyPersistentObject(3, "updatedA", "updatedB", ""));
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -106,7 +109,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
listIndices.getMessage().setHeader(NitriteConstants.OPERATION, new ListIndicesOperation());
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), listIndices);
- Assert.assertEquals(4, listIndices.getMessage().getBody(List.class).size());
+ assertEquals(4, listIndices.getMessage().getBody(List.class).size());
}
@Test
@@ -121,7 +124,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
listIndices.getMessage().setHeader(NitriteConstants.OPERATION, new ListIndicesOperation());
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), listIndices);
- Assert.assertEquals(3, listIndices.getMessage().getBody(List.class).size());
+ assertEquals(3, listIndices.getMessage().getBody(List.class).size());
}
@Test
@@ -130,7 +133,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
exchange.getMessage().setHeader(NitriteConstants.OPERATION, new GetAttributesOperation());
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertNotNull(exchange.getMessage().getBody(Attributes.class));
+ assertNotNull(exchange.getMessage().getBody(Attributes.class));
}
@Test
@@ -141,7 +144,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
));
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -155,7 +158,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
listIndices.getMessage().setHeader(NitriteConstants.OPERATION, new ListIndicesOperation());
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), listIndices);
- Assert.assertEquals(4, listIndices.getMessage().getBody(List.class).size());
+ assertEquals(4, listIndices.getMessage().getBody(List.class).size());
}
@Test
@@ -178,7 +181,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
));
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -192,7 +195,7 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
));
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertEquals(
+ assertEquals(
1,
exchange.getMessage().getHeader(NitriteConstants.WRITE_RESULT, WriteResult.class).getAffectedCount()
);
@@ -205,9 +208,9 @@ public class NitriteProducerRepositoryTest extends AbstractNitriteTest {
template.send(String.format("nitrite://%s?repositoryClass=%s", tempDb(), MyPersistentObject.class.getCanonicalName()), exchange);
- Assert.assertTrue(
- String.format("Expected exception of type IllegalArgumentException, %s given", exchange.getException()),
- exchange.getException() instanceof IllegalArgumentException
+ assertTrue(
+ exchange.getException() instanceof IllegalArgumentException,
+ String.format("Expected exception of type IllegalArgumentException, %s given", exchange.getException())
);
}
}