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:02:06 UTC
[camel] 15/19: [CAMEL-11807] Upgrade camel-mybatis 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 fdbbb558d5d9eb5af4eae6b12fd89e8fb595df4a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jul 9 15:16:20 2020 +0200
[CAMEL-11807] Upgrade camel-mybatis to junit5
---
components/camel-mybatis/pom.xml | 8 ++++----
.../component/mybatis/MyBatisBatchConsumerTest.java | 2 +-
.../mybatis/MyBatisConsumerIdleMessageTest.java | 4 +++-
.../mybatis/MyBatisConsumerIsolatedTest.java | 6 +++---
.../component/mybatis/MyBatisDeleteListTest.java | 8 +++++---
.../camel/component/mybatis/MyBatisDeleteTest.java | 10 ++++++----
.../component/mybatis/MyBatisExecutorTypeTest.java | 6 ++++--
.../component/mybatis/MyBatisInsertListTest.java | 6 ++++--
.../camel/component/mybatis/MyBatisInsertTest.java | 6 ++++--
.../MyBatisInsertWithInputAndOutputHeaderTest.java | 6 ++++--
.../mybatis/MyBatisInsertWithInputHeaderTest.java | 6 ++++--
.../mybatis/MyBatisInsertWithOutputHeaderTest.java | 6 ++++--
.../mybatis/MyBatisInsertWithRollbackTest.java | 6 ++++--
.../mybatis/MyBatisPollingDelayRouteTest.java | 6 ++++--
.../camel/component/mybatis/MyBatisQueueTest.java | 13 ++++++++-----
.../mybatis/MyBatisRouteEmptyResultSetTest.java | 6 ++++--
.../component/mybatis/MyBatisSelectListTest.java | 4 +++-
.../mybatis/MyBatisSelectListWithSplitTest.java | 4 +++-
...isSelectOneExchangeInOutWithOutputHeaderTest.java | 4 +++-
.../component/mybatis/MyBatisSelectOneTest.java | 4 +++-
...MyBatisSelectOneWithInputAndOutputHeaderTest.java | 4 +++-
.../mybatis/MyBatisSelectOneWithInputHeaderTest.java | 4 +++-
.../MyBatisSelectOneWithOutputHeaderTest.java | 4 +++-
.../mybatis/MyBatisShutdownAllTasksTest.java | 10 ++++++----
.../mybatis/MyBatisShutdownCurrentTaskOnlyTest.java | 10 ++++++----
.../camel/component/mybatis/MyBatisTestSupport.java | 6 +++---
.../mybatis/MyBatisUnknownStatementTypeTest.java | 20 +++++++++++---------
.../component/mybatis/MyBatisUpdateListTest.java | 6 ++++--
.../camel/component/mybatis/MyBatisUpdateTest.java | 6 ++++--
.../mybatis/bean/MyBatisBeanInsertTest.java | 6 ++++--
.../mybatis/bean/MyBatisBeanSelectListTest.java | 4 +++-
.../mybatis/bean/MyBatisBeanSelectOneTest.java | 4 +++-
.../MyBatisBeanSelectOneWithInputHeaderTest.java | 4 +++-
.../MyBatisBeanSelectOneWithOutputHeaderTest.java | 4 +++-
34 files changed, 137 insertions(+), 76 deletions(-)
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index b974f7b..b2379b6 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -52,7 +52,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -66,13 +66,13 @@
<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>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
index 9d5e367..17abcde 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisBatchConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.mybatis;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class MyBatisBatchConsumerTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
index ce84211..ea8cc08 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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.assertTrue;
/**
* Test to verify that the polling consumer delivers an empty Exchange when the
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
index d4b1162..27ad1db 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIsolatedTest.java
@@ -22,12 +22,12 @@ import java.util.Queue;
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.apache.camel.support.DefaultExchange;
-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.mockito.Mockito.mock;
-public class MyBatisConsumerIsolatedTest extends Assert {
+public class MyBatisConsumerIsolatedTest {
@Test
public void shouldRespectBatchSize() throws Exception {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteListTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteListTest.java
index 142ceb2..6d85a3f 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteListTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteListTest.java
@@ -20,7 +20,9 @@ import java.util.Arrays;
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 MyBatisDeleteListTest extends MyBatisTestSupport {
@@ -35,7 +37,7 @@ public class MyBatisDeleteListTest extends MyBatisTestSupport {
// there should be 0 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 0 rows", 0, rows.intValue());
+ assertEquals(0, rows.intValue(), "There should be 0 rows");
}
@Test
@@ -49,7 +51,7 @@ public class MyBatisDeleteListTest extends MyBatisTestSupport {
// there should be 2 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 2 rows", 2, rows.intValue());
+ assertEquals(2, rows.intValue(), "There should be 2 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java
index 9753b74..793640c 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisDeleteTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisDeleteTest extends MyBatisTestSupport {
@@ -33,13 +35,13 @@ public class MyBatisDeleteTest extends MyBatisTestSupport {
// there should be 1 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 1 rows", 1, rows.intValue());
+ assertEquals(1, rows.intValue(), "There should be 1 rows");
template.sendBody("direct:start", 123);
// there should be 0 rows now
rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 0 rows", 0, rows.intValue());
+ assertEquals(0, rows.intValue(), "There should be 0 rows");
}
@Test
@@ -53,7 +55,7 @@ public class MyBatisDeleteTest extends MyBatisTestSupport {
// there should be 2 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 2 rows", 2, rows.intValue());
+ assertEquals(2, rows.intValue(), "There should be 2 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisExecutorTypeTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisExecutorTypeTest.java
index 5beaa51..516af8a 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisExecutorTypeTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisExecutorTypeTest.java
@@ -20,7 +20,9 @@ import java.util.Arrays;
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 MyBatisExecutorTypeTest extends MyBatisTestSupport {
@@ -47,7 +49,7 @@ public class MyBatisExecutorTypeTest extends MyBatisTestSupport {
// there should be 2 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 2 rows", 2, rows.intValue());
+ assertEquals(2, rows.intValue(), "There should be 2 rows");
Account james = template.requestBody("mybatis:selectAccountById?statementType=SelectOne", 123, Account.class);
assertEquals("James", james.getFirstName());
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
index 48ffb40..fecd06e 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertListTest.java
@@ -21,7 +21,9 @@ import java.util.List;
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 MyBatisInsertListTest extends MyBatisTestSupport {
@@ -54,7 +56,7 @@ public class MyBatisInsertListTest extends MyBatisTestSupport {
// there should be 4 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 4 rows", 4, rows.intValue());
+ assertEquals(4, rows.intValue(), "There should be 4 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
index 27c5953..b389a53 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisInsertTest extends MyBatisTestSupport {
@@ -39,7 +41,7 @@ public class MyBatisInsertTest extends MyBatisTestSupport {
// there should be 3 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 3 rows", 3, rows.intValue());
+ assertEquals(3, rows.intValue(), "There should be 3 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
index ea3d104..498f2ca 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisInsertWithInputAndOutputHeaderTest extends MyBatisTestSupport {
@@ -45,7 +47,7 @@ public class MyBatisInsertWithInputAndOutputHeaderTest extends MyBatisTestSuppor
// there should be 3 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 3 rows", 3, rows.intValue());
+ assertEquals(3, rows.intValue(), "There should be 3 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
index 0d5a631..b50b74a 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisInsertWithInputHeaderTest extends MyBatisTestSupport {
@@ -41,7 +43,7 @@ public class MyBatisInsertWithInputHeaderTest extends MyBatisTestSupport {
// there should be 3 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 3 rows", 3, rows.intValue());
+ assertEquals(3, rows.intValue(), "There should be 3 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
index 5eba57a..df3a5ce 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisInsertWithOutputHeaderTest extends MyBatisTestSupport {
@@ -45,7 +47,7 @@ public class MyBatisInsertWithOutputHeaderTest extends MyBatisTestSupport {
// there should be 3 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 3 rows", 3, rows.intValue());
+ assertEquals(3, rows.intValue(), "There should be 3 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java
index 07a8bec..0f5feb9 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.mybatis;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.ibatis.exceptions.PersistenceException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisInsertWithRollbackTest extends MyBatisTestSupport {
@@ -36,7 +38,7 @@ public class MyBatisInsertWithRollbackTest extends MyBatisTestSupport {
// there should be still 2 rows
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 2 rows", 2, rows.intValue());
+ assertEquals(2, rows.intValue(), "There should be 2 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisPollingDelayRouteTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisPollingDelayRouteTest.java
index 0fb254e..9b721dd 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisPollingDelayRouteTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisPollingDelayRouteTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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.assertTrue;
public class MyBatisPollingDelayRouteTest extends MyBatisTestSupport {
@@ -31,7 +33,7 @@ public class MyBatisPollingDelayRouteTest extends MyBatisTestSupport {
assertMockEndpointsSatisfied();
long delta = System.currentTimeMillis() - start;
- assertTrue("Should not take that long: " + delta, delta < 7000);
+ assertTrue(delta < 7000, "Should not take that long: " + delta);
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
index 513ac32..cf694a1 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
@@ -20,7 +20,10 @@ import java.util.List;
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.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisQueueTest extends MyBatisTestSupport {
@@ -61,14 +64,14 @@ public class MyBatisQueueTest extends MyBatisTestSupport {
// now lets poll that the account has been inserted
List<?> body = template.requestBody("mybatis:selectProcessedAccounts?statementType=SelectList", null, List.class);
- assertEquals("Wrong size: " + body, 2, body.size());
+ assertEquals(2, body.size(), "Wrong size: " + body);
Account actual = assertIsInstanceOf(Account.class, body.get(0));
- assertEquals("Account.getFirstName()", "Bob", actual.getFirstName());
- assertEquals("Account.getLastName()", "Denver", actual.getLastName());
+ assertEquals("Bob", actual.getFirstName(), "Account.getFirstName()");
+ assertEquals("Denver", actual.getLastName(), "Account.getLastName()");
body = template.requestBody("mybatis:selectUnprocessedAccounts?statementType=SelectList", null, List.class);
- assertEquals("Wrong size: " + body, 0, body.size());
+ assertEquals(0, body.size(), "Wrong size: " + body);
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java
index 820de39..89f55a4 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisRouteEmptyResultSetTest.java
@@ -20,7 +20,9 @@ import java.util.ArrayList;
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 MyBatisRouteEmptyResultSetTest extends MyBatisTestSupport {
@@ -32,7 +34,7 @@ public class MyBatisRouteEmptyResultSetTest extends MyBatisTestSupport {
assertMockEndpointsSatisfied();
// should be an empty list
- assertEquals("Should be an empty list", 0, endpoint.getReceivedExchanges().get(0).getIn().getBody(ArrayList.class).size());
+ assertEquals(0, endpoint.getReceivedExchanges().get(0).getIn().getBody(ArrayList.class).size(), "Should be an empty list");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java
index 7a4615c..640f3ca 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListTest.java
@@ -20,7 +20,9 @@ import java.util.List;
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 MyBatisSelectListTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java
index 6e5a700..9d6858e 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectListWithSplitTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisSelectListWithSplitTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
index 2c70897..ac4b2e6 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneExchangeInOutWithOutputHeaderTest.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.mybatis;
import org.apache.camel.ExchangePattern;
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 MyBatisSelectOneExchangeInOutWithOutputHeaderTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java
index 1f1a46a..5c12d25 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisSelectOneTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
index d4d0e1c..a6639e4 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisSelectOneWithInputAndOutputHeaderTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
index 2453483..8c27219 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisSelectOneWithInputHeaderTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java
index 9e27adc..0c5b549 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisSelectOneWithOutputHeaderTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
index 681ae64..cad5f10 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
@@ -19,13 +19,15 @@ package org.apache.camel.component.mybatis;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisShutdownAllTasksTest extends MyBatisTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -97,7 +99,7 @@ public class MyBatisShutdownAllTasksTest extends MyBatisTestSupport {
Thread.sleep(1000);
// should route all 8
- assertEquals("Should complete all messages", 8, bar.getReceivedCounter());
+ assertEquals(8, bar.getReceivedCounter(), "Should complete all messages");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownCurrentTaskOnlyTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownCurrentTaskOnlyTest.java
index 8bda0f5..f32afe3 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownCurrentTaskOnlyTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownCurrentTaskOnlyTest.java
@@ -19,13 +19,15 @@ package org.apache.camel.component.mybatis;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MyBatisShutdownCurrentTaskOnlyTest extends MyBatisTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -92,7 +94,7 @@ public class MyBatisShutdownCurrentTaskOnlyTest extends MyBatisTestSupport {
context.stop();
// should NOT route all 8
- assertTrue("Should NOT complete all messages, was: " + bar.getReceivedCounter(), bar.getReceivedCounter() < 8);
+ assertTrue(bar.getReceivedCounter() < 8, "Should NOT complete all messages, was: " + bar.getReceivedCounter());
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
index 4500e75..b32a732 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisTestSupport.java
@@ -20,8 +20,8 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
public abstract class MyBatisTestSupport extends CamelTestSupport {
@@ -57,7 +57,7 @@ public abstract class MyBatisTestSupport extends CamelTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java
index d8cc32f..9ae5fb7 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUnknownStatementTypeTest.java
@@ -17,8 +17,13 @@
package org.apache.camel.component.mybatis;
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.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
public class MyBatisUnknownStatementTypeTest extends CamelTestSupport {
@@ -35,13 +40,10 @@ public class MyBatisUnknownStatementTypeTest extends CamelTestSupport {
from("direct:start").to("mybatis:selectAllAccounts");
}
});
- try {
- context.start();
- fail("Should have thrown exception");
- } catch (Exception e) {
- assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause());
- assertEquals("statementType must be specified on: mybatis://selectAllAccounts", e.getCause().getCause().getMessage());
- }
+ Exception e = assertThrows(Exception.class,
+ () -> context.start());
+ assertIsInstanceOf(IllegalArgumentException.class, e.getCause().getCause());
+ assertEquals("statementType must be specified on: mybatis://selectAllAccounts", e.getCause().getCause().getMessage());
}
}
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
index 9a9f519..a8c81c5 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateListTest.java
@@ -22,7 +22,9 @@ import java.util.Map;
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 MyBatisUpdateListTest extends MyBatisTestSupport {
@@ -52,7 +54,7 @@ public class MyBatisUpdateListTest extends MyBatisTestSupport {
// there should be 2 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 2 rows", 2, rows.intValue());
+ assertEquals(2, rows.intValue(), "There should be 2 rows");
Account james = template.requestBody("mybatis:selectAccountById?statementType=SelectOne", 123, Account.class);
assertEquals("James", james.getFirstName());
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java
index 833b0da..5d293dd 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisUpdateTest.java
@@ -18,7 +18,9 @@ package org.apache.camel.component.mybatis;
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 MyBatisUpdateTest extends MyBatisTestSupport {
@@ -39,7 +41,7 @@ public class MyBatisUpdateTest extends MyBatisTestSupport {
// there should be 2 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 2 rows", 2, rows.intValue());
+ assertEquals(2, rows.intValue(), "There should be 2 rows");
Account claus = template.requestBody("mybatis:selectAccountById?statementType=SelectOne", 456, Account.class);
assertEquals("Claus", claus.getFirstName());
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanInsertTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanInsertTest.java
index 55beeb9..3125cf4 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanInsertTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanInsertTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.mybatis.Account;
import org.apache.camel.component.mybatis.MyBatisTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisBeanInsertTest extends MyBatisTestSupport {
@@ -41,7 +43,7 @@ public class MyBatisBeanInsertTest extends MyBatisTestSupport {
// there should be 3 rows now
Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class);
- assertEquals("There should be 3 rows", 3, rows.intValue());
+ assertEquals(3, rows.intValue(), "There should be 3 rows");
}
@Override
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectListTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectListTest.java
index d54343a..ba1559a 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectListTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectListTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.mybatis.Account;
import org.apache.camel.component.mybatis.MyBatisTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisBeanSelectListTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneTest.java
index bcb25b4..6ed2cdd 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.mybatis.Account;
import org.apache.camel.component.mybatis.MyBatisTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisBeanSelectOneTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithInputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithInputHeaderTest.java
index 96f48bd..ee22d9a 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithInputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithInputHeaderTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.mybatis.Account;
import org.apache.camel.component.mybatis.MyBatisTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisBeanSelectOneWithInputHeaderTest extends MyBatisTestSupport {
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithOutputHeaderTest.java
index 49b3d36..c29475e 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/bean/MyBatisBeanSelectOneWithOutputHeaderTest.java
@@ -21,7 +21,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.mybatis.Account;
import org.apache.camel.component.mybatis.MyBatisConstants;
import org.apache.camel.component.mybatis.MyBatisTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisBeanSelectOneWithOutputHeaderTest extends MyBatisTestSupport {