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 361df6530b972913ebce1971b86d579c096bc5da
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jul 9 09:13:08 2020 +0200
[CAMEL-11807] Upgrade camel-syslog to junit5
---
components/camel-syslog/pom.xml | 6 +++---
.../camel/component/syslog/AutomatedConversionTest.java | 10 ++++++----
.../org/apache/camel/component/syslog/MinaDataFormatTest.java | 10 ++++++----
.../camel/component/syslog/MinaManyUDPMessagesTest.java | 10 ++++++----
.../apache/camel/component/syslog/NettyDataFormatTest.java | 10 ++++++----
.../camel/component/syslog/NettyManyUDPMessagesTest.java | 10 ++++++----
.../camel/component/syslog/NettyRfc5425LongMessageTest.java | 10 ++++++----
.../org/apache/camel/component/syslog/NettyRfc5425Test.java | 11 +++++++----
.../org/apache/camel/component/syslog/SyslogEnumsTest.java | 7 ++++---
.../apache/camel/component/syslog/SyslogSpringMinaTest.java | 8 ++++----
.../apache/camel/component/syslog/SyslogSpringNettyTest.java | 8 ++++----
11 files changed, 58 insertions(+), 42 deletions(-)
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 24e0b8a..c277e83 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -52,7 +52,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -61,8 +61,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>
<dependency>
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
index 03afc76..635b0a8 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/AutomatedConversionTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AutomatedConversionTest extends CamelTestSupport {
@@ -38,7 +40,7 @@ public class AutomatedConversionTest extends CamelTestSupport
{
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
private final String rfc5424Message = "<34>1 2003-10-11T22:14:15.003Z
mymachine.example.com su - ID47 - BOM'su root' failed for lonvick on
/dev/pts/8";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
index b8f1c3f..5896ef1 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaDataFormatTest.java
@@ -27,9 +27,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MinaDataFormatTest extends CamelTestSupport {
@@ -38,7 +40,7 @@ public class MinaDataFormatTest extends CamelTestSupport {
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
index 414f285..891ca6a 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/MinaManyUDPMessagesTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MinaManyUDPMessagesTest extends CamelTestSupport {
@@ -37,7 +39,7 @@ public class MinaManyUDPMessagesTest extends CamelTestSupport
{
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
index d75de05..7d10624 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
@@ -27,9 +27,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyDataFormatTest extends CamelTestSupport {
@@ -38,7 +40,7 @@ public class NettyDataFormatTest extends CamelTestSupport {
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
index c8f4032..430df4e 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
@@ -26,9 +26,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyManyUDPMessagesTest extends CamelTestSupport {
@@ -37,7 +39,7 @@ public class NettyManyUDPMessagesTest extends
CamelTestSupport {
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
}
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index 8e19654..e5c3013 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -27,9 +27,11 @@ import
org.apache.camel.component.syslog.netty.Rfc5425FrameDecoder;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyRfc5425LongMessageTest extends CamelTestSupport {
@@ -53,7 +55,7 @@ public class NettyRfc5425LongMessageTest extends
CamelTestSupport {
@BindToRegistry("encoder")
private Rfc5425Encoder encoder = new Rfc5425Encoder();
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index 6813e8e..111f721 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -26,9 +26,12 @@ import
org.apache.camel.component.syslog.netty.Rfc5425FrameDecoder;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class NettyRfc5425Test extends CamelTestSupport {
@@ -46,7 +49,7 @@ public class NettyRfc5425Test extends CamelTestSupport {
@BindToRegistry("encoder")
private Rfc5425Encoder encoder = new Rfc5425Encoder();
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoders=#encoder";
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
index 5f21328..1fd448e 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogEnumsTest.java
@@ -16,10 +16,11 @@
*/
package org.apache.camel.component.syslog;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SyslogEnumsTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SyslogEnumsTest {
@Test
public void testFacilityConstants() {
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
index ee2c4f7..7fdcc18 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringMinaTest.java
@@ -23,9 +23,9 @@ import java.net.InetAddress;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -36,7 +36,7 @@ public class SyslogSpringMinaTest extends
CamelSpringTestSupport {
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
System.setProperty("server-port", new Integer(serverPort).toString());
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
index 4d788fe..b81962c 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/SyslogSpringNettyTest.java
@@ -23,9 +23,9 @@ import java.net.InetAddress;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -35,7 +35,7 @@ public class SyslogSpringNettyTest extends
CamelSpringTestSupport {
private final String message = "<165>Aug 4 05:34:00 mymachine myproc[10]:
%% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK
#\n"
+ " Devices: Mixer=OK,
Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK,
Conveyer2=OK # %%";
- @BeforeClass
+ @BeforeAll
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
System.setProperty("server-port", new Integer(serverPort).toString());
