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/24 20:52:43 UTC
[camel] 01/27: [CAMEL-11807] Upgrade camel-snmp 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 36943e4d5415c6909d998566573239399b06fead
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Jul 22 22:17:01 2020 +0200
[CAMEL-11807] Upgrade camel-snmp to junit5
---
components/camel-snmp/pom.xml | 6 +++---
.../java/org/apache/camel/component/snmp/PollOIDTest.java | 8 ++++----
.../java/org/apache/camel/component/snmp/ProducerTest.java | 8 ++++----
.../java/org/apache/camel/component/snmp/TrapTest.java | 9 +++++----
.../apache/camel/component/snmp/UriConfigurationTest.java | 14 ++++++++------
.../java/org/apache/camel/component/snmp/WalkOIDTest.java | 8 ++++----
6 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml
index 249ead5..b0f32ca 100644
--- a/components/camel-snmp/pom.xml
+++ b/components/camel-snmp/pom.xml
@@ -48,13 +48,13 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<optional>true</optional>
<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-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
index 5419d3f..a067df7 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/PollOIDTest.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +32,7 @@ public class PollOIDTest extends CamelTestSupport {
// a disabled test... before enabling you must fill in a working IP, Port
// and maybe oids in the route below
- @Ignore
+ @Disabled
@Test
public void testOIDPolling() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
index 5bbfa39..fe42aba 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/ProducerTest.java
@@ -20,11 +20,11 @@ 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.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("CAMEL-10319: Set host, port and oids to test snmp producer.")
+@Disabled("CAMEL-10319: Set host, port and oids to test snmp producer.")
public class ProducerTest extends CamelTestSupport {
private String host = "192.168.0.254";
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
index fc75812..4bef612 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
@@ -26,9 +26,8 @@ import org.apache.camel.Producer;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.snmp4j.PDU;
@@ -39,6 +38,8 @@ import org.snmp4j.smi.TimeTicks;
import org.snmp4j.smi.Variable;
import org.snmp4j.smi.VariableBinding;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* This test covers both producing and consuming snmp traps
*/
@@ -85,7 +86,7 @@ public class TrapTest extends CamelTestSupport {
List<Exchange> exchanges = mock.getExchanges();
SnmpMessage msg = (SnmpMessage) exchanges.get(0).getIn();
PDU receivedTrap = msg.getSnmpMessage();
- Assert.assertEquals(trap, receivedTrap);
+ assertEquals(trap, receivedTrap);
if (LOG.isInfoEnabled()) {
LOG.info("Received SNMP TRAP:");
Vector<? extends VariableBinding> variableBindings = receivedTrap.getVariableBindings();
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
index 6de7aef..12f7f6b 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/UriConfigurationTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.component.snmp;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class UriConfigurationTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class UriConfigurationTest {
protected CamelContext context = new DefaultCamelContext();
@Test
@@ -30,7 +32,7 @@ public class UriConfigurationTest extends Assert {
context.start();
Endpoint endpoint = context.getEndpoint("snmp:0.0.0.0:1662?protocol=udp&type=TRAP&oids=1.3.6.1.2.1.7.5.1");
- assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
+ assertTrue(endpoint instanceof SnmpEndpoint, "Endpoint not an SnmpEndpoint: " + endpoint);
SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
@@ -43,7 +45,7 @@ public class UriConfigurationTest extends Assert {
context.start();
Endpoint endpoint = context.getEndpoint("snmp:0.0.0.0?protocol=udp&type=TRAP&oids=1.3.6.1.2.1.7.5.1");
- assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
+ assertTrue(endpoint instanceof SnmpEndpoint, "Endpoint not an SnmpEndpoint: " + endpoint);
SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
assertEquals(SnmpActionType.TRAP, snmpEndpoint.getType());
@@ -56,7 +58,7 @@ public class UriConfigurationTest extends Assert {
context.start();
Endpoint endpoint = context.getEndpoint("snmp:127.0.0.1:1662?protocol=udp&type=POLL&oids=1.3.6.1.2.1.7.5.1");
- assertTrue("Endpoint not an SnmpEndpoint: " + endpoint, endpoint instanceof SnmpEndpoint);
+ assertTrue(endpoint instanceof SnmpEndpoint, "Endpoint not an SnmpEndpoint: " + endpoint);
SnmpEndpoint snmpEndpoint = (SnmpEndpoint) endpoint;
assertEquals(SnmpActionType.POLL, snmpEndpoint.getType());
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java
index 31c0273..92b2727 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/WalkOIDTest.java
@@ -21,9 +21,9 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,7 +32,7 @@ public class WalkOIDTest extends CamelTestSupport {
// a disabled test... before enabling you must fill in a working IP, Port
// and maybe oids in the route below
- @Ignore
+ @Disabled
@Test
public void testOIDWalk() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");