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/06/30 14:08:12 UTC
[camel] 03/23: [CAMEL-11807] Upgrade camel-iec60870 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 bcb801b82c9c110b51a72acd495c19bc2e95a582
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jun 29 18:32:03 2020 +0200
[CAMEL-11807] Upgrade camel-iec60870 to junit5
---
components/camel-iec60870/pom.xml | 6 ++---
.../camel/component/iec60870/ConnectionIdTest.java | 28 ++++++++++++----------
.../camel/component/iec60870/ConnectionTest.java | 9 +++++--
3 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/components/camel-iec60870/pom.xml b/components/camel-iec60870/pom.xml
index e21df3a..d52cb8a 100644
--- a/components/camel-iec60870/pom.xml
+++ b/components/camel-iec60870/pom.xml
@@ -101,12 +101,12 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<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-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
index 182bbe9..d67c9b0 100644
--- a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
+++ b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionIdTest.java
@@ -16,49 +16,53 @@
*/
package org.apache.camel.component.iec60870;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class ConnectionIdTest {
@Test
public void testNotEqual1() {
ConnectionId id1 = new ConnectionId("host", 1202, "id1");
ConnectionId id2 = new ConnectionId("host", 1202, "id2");
- Assert.assertFalse("Must be different", id1.equals(id2));
+ assertNotEquals(id1, id2, "Must be different");
}
@Test
public void testNotEqual2() {
ConnectionId id1 = new ConnectionId("host1", 1202, "id");
ConnectionId id2 = new ConnectionId("host2", 1202, "id");
- Assert.assertFalse("Must be different", id1.equals(id2));
+ assertNotEquals(id1, id2, "Must be different");
}
@Test
public void testNotEqual3() {
ConnectionId id1 = new ConnectionId("host", 1202_1, "id");
ConnectionId id2 = new ConnectionId("host", 1202_2, "id");
- Assert.assertFalse("Must be different", id1.equals(id2));
+ assertNotEquals(id1, id2, "Must be different");
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testIllegal1() {
- new ConnectionId("host", -1, "id");
+ assertThrows(IllegalArgumentException.class,
+ () -> new ConnectionId("host", -1, "id"));
}
@Test
public void testGetters() {
ConnectionId id = new ConnectionId("host", 1202, "id");
- Assert.assertEquals("host", id.getHost());
- Assert.assertEquals(1202, id.getPort());
- Assert.assertEquals("id", id.getConnectionId());
+ assertEquals("host", id.getHost());
+ assertEquals(1202, id.getPort());
+ assertEquals("id", id.getConnectionId());
}
@Test
public void testEqual1() {
ConnectionId id1 = new ConnectionId("host", 1202, "id");
ConnectionId id2 = new ConnectionId("host", 1202, "id");
- Assert.assertTrue("Must be equal", id1.equals(id2));
+ assertEquals(id1, id2, "Must be equal");
}
@Test
@@ -66,6 +70,6 @@ public class ConnectionIdTest {
ConnectionId id1 = new ConnectionId("host", 1202, "id");
ConnectionId id2 = new ConnectionId("host", 1202, "id");
- Assert.assertTrue("Hash code must be equal", id1.hashCode() == id2.hashCode());
+ assertEquals(id1.hashCode(), id2.hashCode(), "Hash code must be equal");
}
}
diff --git a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
index f7d68f8..ad732d0 100644
--- a/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
+++ b/components/camel-iec60870/src/test/java/org/apache/camel/component/iec60870/ConnectionTest.java
@@ -27,10 +27,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.eclipse.neoscada.protocol.iec60870.asdu.types.Value;
import org.eclipse.neoscada.protocol.iec60870.server.data.model.WriteModel.Request;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConnectionTest extends CamelTestSupport {