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/09 20:01:58 UTC
[camel] 07/19: [CAMEL-11807] Upgrade camel-stream 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 a9326a0edf4523f46aadd48b717c1d2b38cc9f9f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jul 9 09:10:31 2020 +0200
[CAMEL-11807] Upgrade camel-stream to junit5
---
components/camel-stream/pom.xml | 6 +++---
.../camel/component/stream/ScanStreamDelayTest.java | 11 +++++++----
.../camel/component/stream/ScanStreamFileManualTest.java | 15 +++++++++------
.../apache/camel/component/stream/ScanStreamFileTest.java | 11 +++++++----
.../component/stream/ScanStreamFileWithFilterTest.java | 11 +++++++----
.../camel/component/stream/SplitStreamFileTest.java | 15 ++++++++++-----
.../apache/camel/component/stream/StreamDelayTest.java | 8 +++++---
.../apache/camel/component/stream/StreamEncodingTest.java | 4 ++--
.../org/apache/camel/component/stream/StreamFileTest.java | 12 ++++++++----
.../stream/StreamGroupLinesLastStrategyTest.java | 8 +++++---
.../component/stream/StreamGroupLinesStrategyTest.java | 8 +++++---
.../camel/component/stream/StreamGroupLinesTest.java | 14 ++++++++++----
.../apache/camel/component/stream/StreamHeaderTest.java | 7 +++++--
.../camel/component/stream/StreamRouteBuilderTest.java | 4 ++--
.../camel/component/stream/StreamSystemErrTest.java | 4 ++--
.../camel/component/stream/StreamSystemOutTest.java | 7 +++++--
16 files changed, 92 insertions(+), 53 deletions(-)
diff --git a/components/camel-stream/pom.xml b/components/camel-stream/pom.xml
index c098d31..3a42392 100644
--- a/components/camel-stream/pom.xml
+++ b/components/camel-stream/pom.xml
@@ -45,7 +45,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -54,8 +54,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>
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java
index 62aa567..81a2926 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamDelayTest.java
@@ -22,9 +22,12 @@ import java.util.concurrent.TimeUnit;
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.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
*
@@ -35,7 +38,7 @@ public class ScanStreamDelayTest extends CamelTestSupport {
private File file;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java
index 83db98a..40ca9e6 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileManualTest.java
@@ -19,21 +19,24 @@ package org.apache.camel.component.stream;
import java.io.File;
import org.apache.camel.builder.RouteBuilder;
-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 static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Unit test for scan stream file
*/
-@Ignore("For manual testing")
+@Disabled("For manual testing")
public class ScanStreamFileManualTest extends CamelTestSupport {
private File file;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
index 7ffc696..537f111 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileTest.java
@@ -21,9 +21,12 @@ import java.io.FileOutputStream;
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.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Unit test for scan stream file
@@ -33,7 +36,7 @@ public class ScanStreamFileTest extends CamelTestSupport {
private File file;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java
index 5246d0f..94cb320 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/ScanStreamFileWithFilterTest.java
@@ -21,9 +21,12 @@ import java.io.FileOutputStream;
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.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Unit test for scan stream file
@@ -33,7 +36,7 @@ public class ScanStreamFileWithFilterTest extends CamelTestSupport {
private File file;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java
index 499a706..4e519e7 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/SplitStreamFileTest.java
@@ -21,14 +21,19 @@ import java.io.File;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.IOConverter;
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.component.stream.StreamGroupLinesTest.LS;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SplitStreamFileTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
@@ -44,7 +49,7 @@ public class SplitStreamFileTest extends CamelTestSupport {
File file = new File("target/stream/splitFile.txt");
String result = IOConverter
.toString(file, new DefaultExchange(context));
- assertEquals("Get a wrong result", "A" + LS + "B" + LS + "C" + LS + "D" + LS + "A" + LS + "B" + LS, result);
+ assertEquals("A" + LS + "B" + LS + "C" + LS + "D" + LS + "A" + LS + "B" + LS, result, "Get a wrong result");
}
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java
index 397e381..9689243 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamDelayTest.java
@@ -17,8 +17,10 @@
package org.apache.camel.component.stream;
import org.apache.camel.builder.RouteBuilder;
-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.assertTrue;
/**
* Unit test for delay option.
@@ -30,7 +32,7 @@ public class StreamDelayTest extends CamelTestSupport {
long start = System.currentTimeMillis();
template.sendBody("direct:in", "Hello Text World\n");
long delta = System.currentTimeMillis() - start;
- assertTrue("Delay should be around 2 sec: " + delta, delta > 1900 && delta < 3000);
+ assertTrue(delta > 1900 && delta < 3000, "Delay should be around 2 sec: " + delta);
}
@Override
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java
index 05b6c9b..92a110c 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamEncodingTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.stream;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for encoding option
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
index 51ce3ce..1783056 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamFileTest.java
@@ -25,9 +25,13 @@ 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 static org.apache.camel.component.stream.StreamGroupLinesTest.LS;
+import static org.apache.camel.test.junit5.TestSupport.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* Unit test for stream file
@@ -42,7 +46,7 @@ public class StreamFileTest extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesLastStrategyTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesLastStrategyTest.java
index 360d44e..4c3a25c 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesLastStrategyTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesLastStrategyTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.stream;
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.junit.jupiter.api.Assertions.assertEquals;
public class StreamGroupLinesLastStrategyTest extends StreamGroupLinesStrategyTest {
@@ -36,11 +38,11 @@ public class StreamGroupLinesLastStrategyTest extends StreamGroupLinesStrategyTe
assertMockEndpointsSatisfied();
Object result = mock.getExchanges().get(0).getIn().getBody();
- assertEquals("Get a wrong result.", "A" + LS + "B" + LS + "C" + LS + "D" + LS, result);
+ assertEquals("A" + LS + "B" + LS + "C" + LS + "D" + LS, result, "Get a wrong result.");
// we did not have 4 lines but since its the last it was triggered anyway
Object result2 = mock.getExchanges().get(1).getIn().getBody();
- assertEquals("Get a wrong result.", "E" + LS + "F" + LS, result2);
+ assertEquals("E" + LS + "F" + LS, result2, "Get a wrong result.");
}
@Override
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
index a55ed99..3c0bf71 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesStrategyTest.java
@@ -21,7 +21,9 @@ import java.util.List;
import org.apache.camel.BindToRegistry;
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.junit.jupiter.api.Assertions.assertEquals;
public class StreamGroupLinesStrategyTest extends StreamGroupLinesTest {
@@ -55,10 +57,10 @@ public class StreamGroupLinesStrategyTest extends StreamGroupLinesTest {
assertMockEndpointsSatisfied();
Object result = mock.getExchanges().get(0).getIn().getBody();
- assertEquals("Get a wrong result.", "A" + LS + "B" + LS + "C" + LS, result);
+ assertEquals("A" + LS + "B" + LS + "C" + LS, result, "Get a wrong result.");
Object result2 = mock.getExchanges().get(1).getIn().getBody();
- assertEquals("Get a wrong result.", "D" + LS + "E" + LS + "F" + LS, result2);
+ assertEquals("D" + LS + "E" + LS + "F" + LS, result2, "Get a wrong result.");
}
@Override
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java
index 28a8291..de3f194 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamGroupLinesTest.java
@@ -22,16 +22,22 @@ import java.util.List;
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.createDirectory;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StreamGroupLinesTest extends CamelTestSupport {
+ public static final String LS = System.lineSeparator();
+
private FileOutputStream fos;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/stream");
createDirectory("target/stream");
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java
index 856dbe1..36792fd 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamHeaderTest.java
@@ -20,8 +20,11 @@ import java.io.IOException;
import java.io.OutputStream;
import org.apache.camel.builder.RouteBuilder;
-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.component.stream.StreamGroupLinesTest.LS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test when using custom output stream.
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java
index ef45253..a18ad13 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamRouteBuilderTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.stream;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class StreamRouteBuilderTest extends CamelTestSupport {
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java
index 899e910..6211ec1 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemErrTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.stream;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
* Unit test for System.err
diff --git a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
index bdd31a5..d502a91 100644
--- a/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
+++ b/components/camel-stream/src/test/java/org/apache/camel/component/stream/StreamSystemOutTest.java
@@ -20,8 +20,11 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.apache.camel.builder.RouteBuilder;
-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.component.stream.StreamGroupLinesTest.LS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test for System.out