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 cfab0a7a2b1c9cb4d0e5860749b5342954fdc4d7
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri May 29 14:02:37 2020 +0200
[CAMEL-11807] Upgrade camel-endpointdsl to junit5
---
core/camel-endpointdsl/pom.xml | 11 ++++++++---
.../org/apache/camel/builder/endpoint/CustomSedaTest.java | 4 +++-
.../org/apache/camel/builder/endpoint/EndpointInjectTest.java | 2 +-
.../camel/builder/endpoint/FileAbsolutePathIssueTest.java | 6 +++---
.../builder/endpoint/FileBatchConsumerMemoryLeakTest.java | 10 +++++-----
.../apache/camel/builder/endpoint/FileConsumeCharsetTest.java | 10 ++++++----
.../java/org/apache/camel/builder/endpoint/FileDelayTest.java | 6 +++---
.../apache/camel/builder/endpoint/FtpRawParameterTest.java | 6 +++++-
.../builder/endpoint/LanguageEndpointScriptRouteTest.java | 2 +-
.../camel/builder/endpoint/LanguageEndpointStaticTest.java | 2 +-
.../camel/builder/endpoint/LanguageHeaderRouteTest.java | 2 +-
.../org/apache/camel/builder/endpoint/LogAdvancedTest.java | 4 +++-
.../org/apache/camel/builder/endpoint/LogToDAdvancedTest.java | 4 +++-
.../endpoint/NormalizedUriPropertyPlaceholderTest.java | 6 ++++--
.../org/apache/camel/builder/endpoint/NormalizedUriTest.java | 6 ++++--
.../test/java/org/apache/camel/builder/endpoint/PahoTest.java | 5 ++++-
.../camel/builder/endpoint/ProcessorDefinitionDslTest.java | 2 +-
.../apache/camel/builder/endpoint/RabbitMQMultiValueTest.java | 5 ++++-
.../org/apache/camel/builder/endpoint/TimerAdvancedTest.java | 4 +++-
.../apache/camel/builder/endpoint/TimerNegativeDelayTest.java | 2 +-
20 files changed, 64 insertions(+), 35 deletions(-)
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index 213a58f..a9e644c 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -60,8 +60,13 @@
<!-- testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -72,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java
index 2abfa35..1bc8e5f 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/CustomSedaTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.seda.SedaComponent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CustomSedaTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java
index df33bd7..c532933 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/EndpointInjectTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.mock;
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java
index 4039641..6147b6b 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileAbsolutePathIssueTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
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 FileAbsolutePathIssueTest extends ContextTestSupport {
@@ -32,7 +32,7 @@ public class FileAbsolutePathIssueTest extends
ContextTestSupport {
private String done;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/issue");
deleteDirectory("target/data/done");
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java
index 6851c0a..53b57ac 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileBatchConsumerMemoryLeakTest.java
@@ -19,20 +19,20 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Unit test to test CAMEL-1652
*/
-@Ignore("Manual test")
+@Disabled("Manual test")
public class FileBatchConsumerMemoryLeakTest extends ContextTestSupport {
private String fileUrl = "target/data/filesorter/";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/filesorter");
super.setUp();
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
index a33cdd5..482eefe 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileConsumeCharsetTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
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;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
*
@@ -31,7 +33,7 @@ import org.junit.Test;
public class FileConsumeCharsetTest extends ContextTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/files");
super.setUp();
@@ -48,7 +50,7 @@ public class FileConsumeCharsetTest extends
ContextTestSupport {
oneExchangeDone.matchesWaitTime();
// file should not exists
- assertFalse("File should been deleted", new
File("target/data/files/report.txt").exists());
+ assertFalse(new File("target/data/files/report.txt").exists(), "File
should been deleted");
}
@Override
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java
index 6f49a8d..3466094 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FileDelayTest.java
@@ -22,13 +22,13 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
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 FileDelayTest extends ContextTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/data/files");
super.setUp();
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
index ad363bf..fa6849f 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/FtpRawParameterTest.java
@@ -19,7 +19,11 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.remote.FtpEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class FtpRawParameterTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java
index 6d2e8db..ec955a4 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointScriptRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.direct;
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java
index ec6d2f6..824c01b 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageEndpointStaticTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.direct;
import static
org.apache.camel.builder.endpoint.StaticEndpointBuilders.language;
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java
index 60bd9c9..fa90e1a 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LanguageHeaderRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class LanguageHeaderRouteTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
index 5cc1e5c..0e85a63 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogAdvancedTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertTrue;
public class LogAdvancedTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
index 48c25c7..c9d1794 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/LogToDAdvancedTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertTrue;
public class LogToDAdvancedTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java
index 8fdf525..83e862f 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriPropertyPlaceholderTest.java
@@ -22,8 +22,10 @@ import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertSame;
public class NormalizedUriPropertyPlaceholderTest extends CamelTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
index c6bbedc..67e648e 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/NormalizedUriTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertSame;
public class NormalizedUriTest extends CamelTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
index dac1ff1..f4445a5 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/PahoTest.java
@@ -20,7 +20,10 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.endpoint.dsl.PahoEndpointBuilderFactory;
import org.apache.camel.component.paho.PahoEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class PahoTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
index a49317b..f016911 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/ProcessorDefinitionDslTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ProcessorDefinitionDslTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
index 573320c..50af2d4 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/RabbitMQMultiValueTest.java
@@ -23,7 +23,10 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.endpoint.dsl.RabbitMQEndpointBuilderFactory;
import org.apache.camel.component.rabbitmq.RabbitMQEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class RabbitMQMultiValueTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
index b257905..8c3486a 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerAdvancedTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.ExceptionHandler;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertTrue;
public class TimerAdvancedTest extends ContextTestSupport {
diff --git
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java
index c0b56d2..62c7ffa 100644
---
a/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java
+++
b/core/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/TimerNegativeDelayTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.builder.endpoint;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TimerNegativeDelayTest extends ContextTestSupport {
