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:36 UTC
[camel] 07/14: [CAMEL-11807] Upgrade camel-lumberjack 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 d16ce0abee2cad0696fdeefac08c77db9e7c18bc
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 15 14:05:47 2020 +0200
[CAMEL-11807] Upgrade camel-lumberjack to junit5
---
components/camel-lumberjack/pom.xml | 6 +++---
.../lumberjack/LumberjackComponentGlobalSSLTest.java | 10 ++++++----
.../lumberjack/LumberjackComponentLifecycleTest.java | 14 +++++++++-----
.../component/lumberjack/LumberjackComponentSSLTest.java | 10 ++++++----
.../component/lumberjack/LumberjackComponentTest.java | 10 ++++++----
.../component/lumberjack/LumberjackDisconnectionTest.java | 10 ++++++----
.../apache/camel/component/lumberjack/LumberjackUtil.java | 2 +-
.../lumberjack/io/LumberjackChannelInitializerTest.java | 12 ++++++------
8 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/components/camel-lumberjack/pom.xml b/components/camel-lumberjack/pom.xml
index b520936..ddcf421 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -57,13 +57,13 @@
<!-- test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
index 12d9392..3ae3b30 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
@@ -28,14 +28,16 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
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;
public class LumberjackComponentGlobalSSLTest extends CamelTestSupport {
private static int port;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
index ce94507..e51b480 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
@@ -19,14 +19,17 @@ package org.apache.camel.component.lumberjack;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
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 org.junit.jupiter.api.Timeout;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LumberjackComponentLifecycleTest extends CamelTestSupport {
private static int port;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
port = AvailablePortFinder.getNextAvailable();
}
@@ -41,7 +44,8 @@ public class LumberjackComponentLifecycleTest extends CamelTestSupport {
};
}
- @Test(timeout = 30_000)
+ @Test
+ @Timeout(30)
public void shouldRestart() throws Exception {
// Given a started context
assertEquals(ServiceStatus.Started, context.getStatus());
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
index dbf2b96..8251269 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentSSLTest.java
@@ -27,14 +27,16 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
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;
public class LumberjackComponentSSLTest extends CamelTestSupport {
private static int port;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java
index b71d4a2..8e53052 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentTest.java
@@ -23,14 +23,16 @@ import java.util.Map;
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.assertEquals;
public class LumberjackComponentTest extends CamelTestSupport {
private static int port;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java
index 7564c57..7582a0b 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackDisconnectionTest.java
@@ -24,14 +24,16 @@ 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.apache.camel.test.junit5.TestSupport.assertCollectionSize;
public class LumberjackDisconnectionTest extends CamelTestSupport {
private static int port;
- @BeforeClass
+ @BeforeAll
public static void beforeClass() {
port = AvailablePortFinder.getNextAvailable();
}
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
index 289dd9c..b6e7a6d 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
@@ -38,7 +38,7 @@ import io.netty.handler.ssl.SslHandler;
import org.apache.camel.support.jsse.SSLContextParameters;
import static io.netty.buffer.Unpooled.wrappedBuffer;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
final class LumberjackUtil {
private LumberjackUtil() {
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java
index c2c7fdf..edab2d4 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/io/LumberjackChannelInitializerTest.java
@@ -24,12 +24,12 @@ import java.util.Map;
import io.netty.buffer.ByteBuf;
import io.netty.channel.embedded.EmbeddedChannel;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static io.netty.buffer.Unpooled.buffer;
import static org.apache.camel.component.lumberjack.io.LumberjackConstants.TYPE_ACKNOWLEDGE;
import static org.apache.camel.component.lumberjack.io.LumberjackConstants.VERSION_V2;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LumberjackChannelInitializerTest {
@Test
@@ -72,9 +72,9 @@ public class LumberjackChannelInitializerTest {
}
private void checkAck(ByteBuf buf, int sequence) {
- assertEquals("version", (short) VERSION_V2, buf.readUnsignedByte());
- assertEquals("frame", (short) TYPE_ACKNOWLEDGE, buf.readUnsignedByte());
- assertEquals("sequence", sequence, buf.readInt());
- assertEquals("remaining", 0, buf.readableBytes());
+ assertEquals((short) VERSION_V2, buf.readUnsignedByte(), "version");
+ assertEquals((short) TYPE_ACKNOWLEDGE, buf.readUnsignedByte(), "frame");
+ assertEquals(sequence, buf.readInt(), "sequence");
+ assertEquals(0, buf.readableBytes(), "remaining");
}
}