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 6c6c997b4b846f73201597e386fedecd1bd83257
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 08:54:35 2020 +0200
[CAMEL-11807] Upgrade camel-influxdb to junit5
---
components/camel-influxdb/pom.xml | 8 ++++----
.../org/apache/camel/component/influxdb/AbstractInfluxDbTest.java | 3 +--
.../component/influxdb/InfluxDbEnsureDatabaseExistsTest.java | 6 +++---
.../camel/component/influxdb/InfluxDbProducerBatchTest.java | 6 +++---
.../apache/camel/component/influxdb/InfluxDbProducerPingTest.java | 6 +++---
.../camel/component/influxdb/InfluxDbProducerQueryTest.java | 6 +++---
.../org/apache/camel/component/influxdb/InfluxDbProducerTest.java | 6 +++---
.../component/influxdb/converters/CamelInfluxDbConverterTest.java | 6 +++---
8 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/components/camel-influxdb/pom.xml
b/components/camel-influxdb/pom.xml
index b3038e9..8ea4d99 100644
--- a/components/camel-influxdb/pom.xml
+++ b/components/camel-influxdb/pom.xml
@@ -61,12 +61,12 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -75,8 +75,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-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
index b3570335..9951a8d 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/AbstractInfluxDbTest.java
@@ -17,11 +17,10 @@
package org.apache.camel.component.influxdb;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.influxdb.InfluxDB;
import org.influxdb.impl.InfluxDBImpl;
-
import static org.mockito.Mockito.mock;
public class AbstractInfluxDbTest extends CamelTestSupport {
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
index 047872a..c96e89e 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbEnsureDatabaseExistsTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.influxdb.dto.Point;
import org.influxdb.dto.Query;
import org.influxdb.dto.QueryResult;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
public class InfluxDbEnsureDatabaseExistsTest extends AbstractInfluxDbTest {
@@ -54,7 +54,7 @@ public class InfluxDbEnsureDatabaseExistsTest extends
AbstractInfluxDbTest {
};
}
- @Before
+ @BeforeEach
public void resetEndpoints() {
errorEndpoint.reset();
successEndpoint.reset();
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
index 26ddf11..8389ae6 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerBatchTest.java
@@ -23,8 +23,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.influxdb.dto.BatchPoints;
import org.influxdb.dto.Point;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfluxDbProducerBatchTest extends AbstractInfluxDbTest {
@@ -49,7 +49,7 @@ public class InfluxDbProducerBatchTest extends
AbstractInfluxDbTest {
};
}
- @Before
+ @BeforeEach
public void resetEndpoints() {
errorEndpoint.reset();
successEndpoint.reset();
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java
index 4bb2d06..a082d0e 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerPingTest.java
@@ -22,8 +22,8 @@ import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfluxDbProducerPingTest extends AbstractInfluxDbTest {
@@ -43,7 +43,7 @@ public class InfluxDbProducerPingTest extends
AbstractInfluxDbTest {
};
}
- @Before
+ @BeforeEach
public void resetEndpoints() {
successEndpoint.reset();
}
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java
index 281eaed..d10cbf0 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerQueryTest.java
@@ -24,8 +24,8 @@ 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.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfluxDbProducerQueryTest extends AbstractInfluxDbTest {
@@ -58,7 +58,7 @@ public class InfluxDbProducerQueryTest extends
AbstractInfluxDbTest {
};
}
- @Before
+ @BeforeEach
public void resetEndpoints() {
errorEndpoint.reset();
successEndpoint.reset();
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java
index cf5535a..ca4649f 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/InfluxDbProducerTest.java
@@ -22,8 +22,8 @@ import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class InfluxDbProducerTest extends AbstractInfluxDbTest {
@@ -48,7 +48,7 @@ public class InfluxDbProducerTest extends
AbstractInfluxDbTest {
};
}
- @Before
+ @BeforeEach
public void resetEndpoints() {
errorEndpoint.reset();
successEndpoint.reset();
diff --git
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverterTest.java
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverterTest.java
index bef3b80..7af4caa 100644
---
a/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverterTest.java
+++
b/components/camel-influxdb/src/test/java/org/apache/camel/component/influxdb/converters/CamelInfluxDbConverterTest.java
@@ -21,12 +21,12 @@ import java.util.Map;
import org.apache.camel.component.influxdb.InfluxDbConstants;
import org.influxdb.dto.Point;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CamelInfluxDbConverterTest {
