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 526fea598efbea2948188d9d1279bc61c7395815
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 30 14:18:30 2020 +0200
[CAMEL-11807] Upgrade camel-jpa to junit5
---
components/camel-jpa/pom.xml | 11 +++--
.../camel-jpa/src/main/docs/jpa-component.adoc | 4 +-
.../camel/component/jpa/AbstractJpaMethodTest.java | 15 ++++--
.../camel/component/jpa/JpaComponentTest.java | 9 +++-
.../camel/component/jpa/JpaEndpointTest.java | 8 +++-
.../org/apache/camel/component/jpa/JpaTest.java | 45 +++++++++--------
.../camel/component/jpa/JpaUseMergeTest.java | 5 +-
.../camel/component/jpa/JpaUsePersistTest.java | 56 +++++++++++++---------
.../jpa/JpaWithNamedQueryAndParametersTest.java | 31 ++++++------
.../camel/component/jpa/JpaWithNamedQueryTest.java | 41 ++++++++--------
.../component/jpa/JpaWithNativeQueryTest.java | 7 ++-
.../jpa/JpaWithNativeQueryWithResultClassTest.java | 7 ++-
.../camel/component/jpa/JpaWithQueryTest.java | 2 +
.../camel/component/jpa/QueryBuilderTest.java | 7 ++-
.../java/org/apache/camel/examples/MultiSteps.java | 5 +-
.../camel/processor/jpa/AbstractJpaTest.java | 13 +++--
.../jpa/FileConsumerJpaIdempotentTest.java | 8 ++--
.../camel/processor/jpa/JpaBatchConsumerTest.java | 2 +-
.../camel/processor/jpa/JpaCronSchedulerTest.java | 4 +-
.../camel/processor/jpa/JpaFlushOnSendTest.java | 5 +-
.../processor/jpa/JpaIdempotentConsumerTest.java | 18 +++----
.../camel/processor/jpa/JpaNonTXRollbackTest.java | 7 ++-
.../jpa/JpaPollingConsumerLockEntityTest.java | 6 +--
.../processor/jpa/JpaPollingConsumerTest.java | 4 +-
.../camel/processor/jpa/JpaPreConsumedTest.java | 4 +-
.../processor/jpa/JpaProducerConcurrentTest.java | 13 ++++-
.../processor/jpa/JpaProducerFindEntityTest.java | 4 +-
.../camel/processor/jpa/JpaProducerNoBodyTest.java | 5 +-
.../jpa/JpaProducerPassingEntityManagerTest.java | 5 +-
.../camel/processor/jpa/JpaProducerRemoveTest.java | 5 +-
.../JpaProducerWithQueryParametersHeaderTest.java | 15 +++---
.../processor/jpa/JpaProducerWithQueryTest.java | 15 +++---
.../jpa/JpaRouteConsumeLockEntityTest.java | 2 +-
.../processor/jpa/JpaRouteMaximumResultsTest.java | 6 ++-
.../jpa/JpaRouteSharedEntityManagerTest.java | 11 +++--
.../jpa/JpaRouteSkipLockedEntityTest.java | 12 +++--
.../apache/camel/processor/jpa/JpaRouteTest.java | 8 ++--
.../jpa/JpaRoutemaxMessagesPerPollTest.java | 2 +-
.../camel/processor/jpa/JpaTXRollbackTest.java | 8 ++--
.../apache/camel/processor/jpa/JpaWireTapTest.java | 8 ++--
40 files changed, 275 insertions(+), 168 deletions(-)
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 445d301..3a624bb 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -69,7 +69,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -88,8 +88,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.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc
b/components/camel-jpa/src/main/docs/jpa-component.adoc
index cf9b60e..eee7d89 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -426,8 +426,8 @@ but the following listed types were not enhanced at build
time or at class load
at
org.springframework.transaction.support.TransactionTemplate.execute(TransactionTemplate.java:127)
at
org.apache.camel.processor.jpa.JpaRouteTest.cleanupRepository(JpaRouteTest.java:96)
at
org.apache.camel.processor.jpa.JpaRouteTest.createCamelContext(JpaRouteTest.java:67)
- at
org.apache.camel.test.junit4.CamelTestSupport.doSetUp(CamelTestSupport.java:238)
- at
org.apache.camel.test.junit4.CamelTestSupport.setUp(CamelTestSupport.java:208)
+ at
org.apache.camel.test.junit5.CamelTestSupport.doSetUp(CamelTestSupport.java:238)
+ at
org.apache.camel.test.junit5.CamelTestSupport.setUp(CamelTestSupport.java:208)
--------------------------------------------------------------------------------------------------------------------------------------------------------
The problem here is that the source has been compiled or recompiled through
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java
index ccab26a..9f85fb7 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodTest.java
@@ -28,13 +28,20 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.examples.Address;
import org.apache.camel.examples.Customer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Test;
+import org.apache.camel.examples.MultiSteps;
+import org.apache.camel.examples.Order;
+import org.apache.camel.examples.SendEmail;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public abstract class AbstractJpaMethodTest extends CamelTestSupport {
protected JpaEndpoint endpoint;
@@ -46,7 +53,7 @@ public abstract class AbstractJpaMethodTest extends
CamelTestSupport {
abstract boolean usePersist();
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (entityManager != null) {
entityManager.close();
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
index 97796cc..5596c98 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaComponentTest.java
@@ -21,10 +21,15 @@ import javax.persistence.LockModeType;
import javax.persistence.Persistence;
import org.apache.camel.examples.SendEmail;
-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 org.springframework.orm.jpa.JpaTransactionManager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
public class JpaComponentTest extends CamelTestSupport {
@Test
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
index c2ea220..e7cf131 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaEndpointTest.java
@@ -20,10 +20,14 @@ import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import org.apache.camel.examples.SendEmail;
-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 org.springframework.orm.jpa.JpaTransactionManager;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
public class JpaEndpointTest extends CamelTestSupport {
@Test
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
index b3ccc31..a5c024a 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
@@ -32,17 +32,20 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.service.ServiceHelper;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
-public class JpaTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JpaTest {
private static final Logger LOG = LoggerFactory.getLogger(JpaTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
protected ProducerTemplate template;
@@ -67,9 +70,9 @@ public class JpaTest extends Assert {
// now lets assert that there is a result
List<?> results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have results: " + results, 1, results.size());
+ assertEquals(1, results.size(), "Should have results: " + results);
SendEmail mail = (SendEmail) results.get(0);
- assertEquals("address property", "f...@bar.com", mail.getAddress());
+ assertEquals("f...@bar.com", mail.getAddress(), "address property");
// now lets create a consumer to consume it
consumer = endpoint.createConsumer(new Processor() {
@@ -78,7 +81,7 @@ public class JpaTest extends Assert {
receivedExchange = e;
// should have a EntityManager
EntityManager entityManager =
e.getIn().getHeader(JpaConstants.ENTITY_MANAGER, EntityManager.class);
- assertNotNull("Should have a EntityManager as header",
entityManager);
+ assertNotNull(entityManager, "Should have a EntityManager as
header");
latch.countDown();
}
});
@@ -88,8 +91,8 @@ public class JpaTest extends Assert {
assertNotNull(receivedExchange);
SendEmail result = receivedExchange.getIn().getBody(SendEmail.class);
- assertNotNull("Received a POJO", result);
- assertEquals("address property", "f...@bar.com", result.getAddress());
+ assertNotNull(result, "Received a POJO");
+ assertEquals("f...@bar.com", result.getAddress(), "address property");
}
@Test
@@ -98,7 +101,7 @@ public class JpaTest extends Assert {
template.send(listEndpoint, new Processor() {
public void process(Exchange exchange) {
// use a list
- List list = new ArrayList();
+ List<Object> list = new ArrayList<>();
list.add(new SendEmail("f...@bar.com"));
list.add(new SendEmail("f...@bar.com"));
exchange.getIn().setBody(list);
@@ -107,24 +110,24 @@ public class JpaTest extends Assert {
// now lets assert that there is a result
List<?> results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have results: " + results, 2, results.size());
+ assertEquals(2, results.size(), "Should have results: " + results);
SendEmail mail = (SendEmail) results.get(0);
- assertEquals("address property", "f...@bar.com", mail.getAddress());
- assertNotNull("id", mail.getId());
+ assertEquals("f...@bar.com", mail.getAddress(), "address property");
+ assertNotNull(mail.getId(), "id");
SendEmail mail2 = (SendEmail) results.get(1);
- assertEquals("address property", "f...@bar.com", mail2.getAddress());
- assertNotNull("id", mail2.getId());
+ assertEquals("f...@bar.com", mail2.getAddress(), "address property");
+ assertNotNull(mail2.getId(), "id");
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
camelContext.start();
template = camelContext.createProducerTemplate();
Endpoint value = camelContext.getEndpoint(getEndpointUri());
- assertNotNull("Could not find endpoint!", value);
- assertTrue("Should be a JPA endpoint but was: " + value, value
instanceof JpaEndpoint);
+ assertNotNull(value, "Could not find endpoint!");
+ assertTrue(value instanceof JpaEndpoint, "Should be a JPA endpoint but
was: " + value);
endpoint = (JpaEndpoint) value;
listEndpoint = camelContext.getEndpoint(getEndpointUri() +
"&entityType=java.util.List", JpaEndpoint.class);
@@ -142,14 +145,14 @@ public class JpaTest extends Assert {
});
List<?> results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have no results: " + results, 0, results.size());
+ assertEquals(0, results.size(), "Should have no results: " + results);
}
protected String getEndpointUri() {
return "jpa://" + SendEmail.class.getName();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
ServiceHelper.stopService(consumer, template);
camelContext.stop();
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java
index 0b22248..f2a8369 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUseMergeTest.java
@@ -20,10 +20,13 @@ import java.util.List;
import org.apache.camel.examples.Address;
import org.apache.camel.examples.Customer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class JpaUseMergeTest extends AbstractJpaMethodTest {
@Override
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java
index d99c9ca..f2b26eb 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaUsePersistTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.camel.component.jpa;
+import java.util.Random;
+
import javax.persistence.PersistenceException;
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.examples.Order;
-import org.hamcrest.CoreMatchers;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
-public class JpaUsePersistTest extends AbstractJpaMethodTest {
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+public class JpaUsePersistTest extends AbstractJpaMethodTest {
@Override
public boolean usePersist() {
@@ -37,29 +39,37 @@ public class JpaUsePersistTest extends
AbstractJpaMethodTest {
@Test
public void produceExistingEntityShouldThrowAnException() throws Exception
{
setUp("jpa://" + Order.class.getName() + "?usePersist=true");
-
- Order order = createOrder();
- save(order);
- // and adjust some values
- order = createOrder();
+ long id = new Random().nextLong();
+ Order order2 = new Order();
+ order2.setId(id);
+ order2.setProductName("Beer");
+ order2.setProductSku("12345");
+ order2.setQuantity(5);
+ save(order2);
+
+ // we cannot store the 2nd order as its using the same id as the 1st
+ Order order = new Order();
+ order.setId(id);
order.setProductName("Cheese");
order.setProductSku("54321");
order.setQuantity(2);
-
- // we cannot store the 2nd order as its using the same id as the 1st
-
expectedException.expectCause(CoreMatchers.instanceOf(PersistenceException.class));
- template.requestBody(endpoint, order);
+ assertIsInstanceOf(PersistenceException.class,
assertThrows(CamelExecutionException.class,
+ () -> template.requestBody(endpoint, order)).getCause());
assertEntitiesInDatabase(1, Order.class.getName());
}
- private Order createOrder() {
- Order order = new Order();
- order.setId(1L);
- order.setProductName("Beer");
- order.setProductSku("12345");
- order.setQuantity(5);
- return order;
+ @Override
+ protected void setUp(String endpointUri) throws Exception {
+ super.setUp(endpointUri);
+ transactionTemplate.execute(new TransactionCallback<Object>() {
+ public Object doInTransaction(TransactionStatus status) {
+ entityManager.joinTransaction();
+ entityManager.createQuery("delete from " +
Order.class.getName()).executeUpdate();
+ return null;
+ }
+ });
}
+
}
\ No newline at end of file
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
index f7bbf5b..ea17ebb 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
@@ -33,17 +33,20 @@ import org.apache.camel.examples.Customer;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.service.ServiceHelper;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
-public class JpaWithNamedQueryAndParametersTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JpaWithNamedQueryAndParametersTest {
protected static final Logger LOG =
LoggerFactory.getLogger(JpaWithNamedQueryAndParametersTest.class);
@@ -74,7 +77,7 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
});
List<?> results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have no results: " + results, 0, results.size());
+ assertEquals(0, results.size(), "Should have no results: " + results);
// lets produce some objects
template.send("jpa://" + Customer.class.getName(), new Processor() {
@@ -87,9 +90,9 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
// now lets assert that there is a result
results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have results: " + results, 1, results.size());
+ assertEquals(1, results.size(), "Should have results: " + results);
Customer customer = (Customer)results.get(0);
- assertEquals("name property", "Willem", customer.getName());
+ assertEquals("Willem", customer.getName(), "name property");
// now lets create a consumer to consume it
consumer = endpoint.createConsumer(new Processor() {
@@ -112,15 +115,15 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
protected void assertReceivedResult(Exchange exchange) {
assertNotNull(exchange);
Customer result = exchange.getIn().getBody(Customer.class);
- assertNotNull("Received a POJO", result);
- assertEquals("name property", "Willem", result.getName());
+ assertNotNull(result, "Received a POJO");
+ assertEquals("Willem", result.getName(), "name property");
}
protected void assertURIQueryOption(JpaConsumer jpaConsumer) {
assertEquals("findAllCustomersWithName", jpaConsumer.getNamedQuery());
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
camelContext = new DefaultCamelContext();
SimpleRegistry registry = new SimpleRegistry();
@@ -135,8 +138,8 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
template = camelContext.createProducerTemplate();
Endpoint value = camelContext.getEndpoint(getEndpointUri());
- assertNotNull("Could not find endpoint!", value);
- assertTrue("Should be a JPA endpoint but was: " + value, value
instanceof JpaEndpoint);
+ assertNotNull(value, "Could not find endpoint!");
+ assertTrue(value instanceof JpaEndpoint, "Should be a JPA endpoint but
was: " + value);
endpoint = (JpaEndpoint)value;
transactionTemplate = endpoint.createTransactionTemplate();
@@ -147,7 +150,7 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
return "jpa://" + Customer.class.getName() +
"?namedQuery=findAllCustomersWithName¶meters=#params";
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
ServiceHelper.stopService(consumer, template);
camelContext.stop();
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
index 64ea1f2..ad3585c 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
@@ -31,17 +31,20 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.service.ServiceHelper;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
-public class JpaWithNamedQueryTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class JpaWithNamedQueryTest {
protected static final Logger LOG =
LoggerFactory.getLogger(JpaWithNamedQueryTest.class);
@@ -73,7 +76,7 @@ public class JpaWithNamedQueryTest extends Assert {
});
List<?> results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have no results: " + results, 0, results.size());
+ assertEquals(0, results.size(), "Should have no results: " + results);
// lets produce some objects
template.send("jpa://" + MultiSteps.class.getName(), new Processor() {
@@ -84,9 +87,9 @@ public class JpaWithNamedQueryTest extends Assert {
// now lets assert that there is a result
results = entityManager.createQuery(queryText).getResultList();
- assertEquals("Should have results: " + results, 1, results.size());
+ assertEquals(1, results.size(), "Should have results: " + results);
MultiSteps mail = (MultiSteps)results.get(0);
- assertEquals("address property", "f...@bar.com", mail.getAddress());
+ assertEquals("f...@bar.com", mail.getAddress(), "address property");
// now lets create a consumer to consume it
consumer = endpoint.createConsumer(new Processor() {
@@ -118,21 +121,21 @@ public class JpaWithNamedQueryTest extends Assert {
// now lets assert that there are still 2 entities left
List<?> rows = entityManager2.createQuery("select x from
MultiSteps x").getResultList();
- assertEquals("Number of entities: " + rows, 2, rows.size());
+ assertEquals(2, rows.size(), "Number of entities: " + rows);
int counter = 1;
for (Object rowObj : rows) {
- assertTrue("Rows are not instances of MultiSteps", rowObj
instanceof MultiSteps);
+ assertTrue(rowObj instanceof MultiSteps, "Rows are not
instances of MultiSteps");
final MultiSteps row = (MultiSteps) rowObj;
LOG.info("entity: " + counter++ + " = " + row);
if (row.getAddress().equals("f...@bar.com")) {
LOG.info("Found updated row: " + row);
- assertEquals("Updated row step for: " + row,
getUpdatedStepValue(), row.getStep());
+ assertEquals(getUpdatedStepValue(), row.getStep(),
"Updated row step for: " + row);
} else {
// dummy row
- assertEquals("dummy row step for: " + row, 4,
row.getStep());
- assertEquals("Not the expected row: " + row, "cheese",
row.getAddress());
+ assertEquals(4, row.getStep(), "dummy row step for: "
+ row);
+ assertEquals("cheese", row.getAddress(), "Not the
expected row: " + row);
}
}
return null;
@@ -146,8 +149,8 @@ public class JpaWithNamedQueryTest extends Assert {
protected void assertReceivedResult(Exchange exchange) {
assertNotNull(exchange);
MultiSteps result = exchange.getIn().getBody(MultiSteps.class);
- assertNotNull("Received a POJO", result);
- assertEquals("address property", "f...@bar.com", result.getAddress());
+ assertNotNull(result, "Received a POJO");
+ assertEquals("f...@bar.com", result.getAddress(), "address property");
}
protected int getUpdatedStepValue() {
@@ -158,14 +161,14 @@ public class JpaWithNamedQueryTest extends Assert {
assertEquals("step1", jpaConsumer.getNamedQuery());
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
camelContext.start();
template = camelContext.createProducerTemplate();
Endpoint value = camelContext.getEndpoint(getEndpointUri());
- assertNotNull("Could not find endpoint!", value);
- assertTrue("Should be a JPA endpoint but was: " + value, value
instanceof JpaEndpoint);
+ assertNotNull(value, "Could not find endpoint!");
+ assertTrue(value instanceof JpaEndpoint, "Should be a JPA endpoint but
was: " + value);
endpoint = (JpaEndpoint)value;
transactionTemplate = endpoint.createTransactionTemplate();
@@ -176,7 +179,7 @@ public class JpaWithNamedQueryTest extends Assert {
return "jpa://" + MultiSteps.class.getName() + "?namedQuery=step1";
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
ServiceHelper.stopService(consumer, template);
camelContext.stop();
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
index 2ce6f17..899eea1 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryTest.java
@@ -19,6 +19,9 @@ package org.apache.camel.component.jpa;
import org.apache.camel.Exchange;
import org.apache.camel.examples.MultiSteps;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class JpaWithNativeQueryTest extends JpaWithNamedQueryTest {
/**
@@ -29,8 +32,8 @@ public class JpaWithNativeQueryTest extends
JpaWithNamedQueryTest {
protected void assertReceivedResult(Exchange exchange) {
assertNotNull(exchange);
Object[] result = exchange.getIn().getBody(Object[].class);
- assertNotNull("Received an object array", result);
- assertEquals("address property", "f...@bar.com", result[1]);
+ assertNotNull(result, "Received an object array");
+ assertEquals("f...@bar.com", result[1], "address property");
}
/**
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
index c1d0051..d00a9d9 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNativeQueryWithResultClassTest.java
@@ -19,6 +19,9 @@ package org.apache.camel.component.jpa;
import org.apache.camel.Exchange;
import org.apache.camel.examples.MultiSteps;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
public class JpaWithNativeQueryWithResultClassTest extends
JpaWithNamedQueryTest {
/**
@@ -28,8 +31,8 @@ public class JpaWithNativeQueryWithResultClassTest extends
JpaWithNamedQueryTest
protected void assertReceivedResult(Exchange exchange) {
assertNotNull(exchange);
MultiSteps result = exchange.getIn().getBody(MultiSteps.class);
- assertNotNull("Received an object array", result);
- assertEquals("address property", "f...@bar.com", result.getAddress());
+ assertNotNull(result, "Received an object array");
+ assertEquals("f...@bar.com", result.getAddress(), "address property");
}
/**
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
index eb3dcba..8ad4548 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithQueryTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.jpa;
import org.apache.camel.examples.MultiSteps;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class JpaWithQueryTest extends JpaWithNamedQueryTest {
@Override
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java
index 29c04bd..3624360 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/QueryBuilderTest.java
@@ -19,8 +19,11 @@ package org.apache.camel.component.jpa;
import java.util.HashMap;
import java.util.Map;
-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.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class QueryBuilderTest extends CamelTestSupport {
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
b/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
index 005dc48..52145ba 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/examples/MultiSteps.java
@@ -24,10 +24,11 @@ import javax.persistence.NamedQuery;
import org.apache.camel.Exchange;
import org.apache.camel.component.jpa.Consumed;
import org.apache.camel.component.jpa.PreConsumed;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* Represents a task which has multiple steps so that it can move from stage
to stage
* with the method annotated with {@link @Consumed} being invoked when the
Camel consumer
@@ -78,7 +79,7 @@ public class MultiSteps {
@PreConsumed
public void beforeGoToNextStep(Exchange exchange) {
// we could do some thing to update the entity by using the exchange
property
- Assert.assertNotNull(exchange);
+ assertNotNull(exchange);
LOG.info("Calling beforeGoToNextStep");
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java
index 90b78ec..7abc150 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java
@@ -24,22 +24,25 @@ import javax.persistence.EntityManagerFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public abstract class AbstractJpaTest extends CamelTestSupport {
protected ApplicationContext applicationContext;
protected TransactionTemplate transactionTemplate;
protected EntityManager entityManager;
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
EntityManagerFactory entityManagerFactory =
applicationContext.getBean("entityManagerFactory",
@@ -50,7 +53,7 @@ public abstract class AbstractJpaTest extends
CamelTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
if (entityManager != null) {
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java
index 5bfe8a0..2fa869a 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java
@@ -25,11 +25,13 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.idempotent.jpa.MessageProcessed;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
+
/**
* Unit test using jpa idempotent repository for the file consumer.
*/
@@ -39,7 +41,7 @@ public class FileConsumerJpaIdempotentTest extends
AbstractJpaTest {
protected static final String PROCESSOR_NAME = "FileConsumer";
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/idempotent");
super.setUp();
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java
index ca40fcd..8eaca42 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaBatchConsumerTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JpaBatchConsumerTest extends AbstractJpaTest {
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaCronSchedulerTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaCronSchedulerTest.java
index b0fbae4..95574ba 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaCronSchedulerTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaCronSchedulerTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JpaCronSchedulerTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java
index 434ffa3..69a678e 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaFlushOnSendTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-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 JpaFlushOnSendTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java
index 427aa2c..f898e0f 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java
@@ -30,12 +30,14 @@ import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.idempotent.jpa.MessageProcessed;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import static
org.apache.camel.processor.idempotent.jpa.JpaMessageIdRepository.jpaMessageIdRepository;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JpaIdempotentConsumerTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
MessageProcessed.class.getName() + " x where x.processorName = ?1";
@@ -67,7 +69,7 @@ public class JpaIdempotentConsumerTest extends
AbstractJpaTest {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
startEndpoint = resolveMandatoryEndpoint("direct:start");
@@ -111,9 +113,9 @@ public class JpaIdempotentConsumerTest extends
AbstractJpaTest {
}
assertEquals(3, ids.size());
- assertTrue("Should contain message 1", ids.contains("1"));
- assertTrue("Should contain message 2", ids.contains("2"));
- assertTrue("Should contain message 3", ids.contains("3"));
+ assertTrue(ids.contains("1"), "Should contain message 1");
+ assertTrue(ids.contains("2"), "Should contain message 2");
+ assertTrue(ids.contains("3"), "Should contain message 3");
}
@SuppressWarnings("unchecked")
@@ -162,8 +164,8 @@ public class JpaIdempotentConsumerTest extends
AbstractJpaTest {
}
assertEquals(2, ids.size());
- assertTrue("Should contain message 1", ids.contains("1"));
- assertTrue("Should contain message 3", ids.contains("3"));
+ assertTrue(ids.contains("1"), "Should contain message 1");
+ assertTrue(ids.contains("3"), "Should contain message 3");
}
protected void sendMessage(final Object messageId, final Object body) {
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
index 2d102e4..b105a8a 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaNonTXRollbackTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.examples.SendEmail;
-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.assertTrue;
public class JpaNonTXRollbackTest extends AbstractJpaTest {
@@ -52,7 +55,7 @@ public class JpaNonTXRollbackTest extends AbstractJpaTest {
assertEquals(1, bar.intValue());
// kaboom fails and we retry it again
- assertTrue("Should be >= 2, was: " + kaboom.intValue(),
kaboom.intValue() >= 2);
+ assertTrue(kaboom.intValue() >= 2, "Should be >= 2, was: " +
kaboom.intValue());
}
@Override
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
index 97e979f..67f6570 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerLockEntityTest.java
@@ -27,13 +27,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.Customer;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class JpaPollingConsumerLockEntityTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
Customer.class.getName() + " x";
- @Before
+ @BeforeEach
@Override
public void setUp() throws Exception {
super.setUp();
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerTest.java
index 6f9d734..0763d42 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPollingConsumerTest.java
@@ -22,7 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.Customer;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JpaPollingConsumerTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
Customer.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPreConsumedTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPreConsumedTest.java
index 84ea49c..077af08 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPreConsumedTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaPreConsumedTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JpaPreConsumedTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
index 1e078dd..2935dda 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
@@ -27,10 +27,19 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JpaProducerConcurrentTest extends AbstractJpaTest {
+
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(JpaProducerConcurrentTest.class);
@Test
public void testNoConcurrentProducers() throws Exception {
@@ -68,7 +77,7 @@ public class JpaProducerConcurrentTest extends
AbstractJpaTest {
for (Future<SendEmail> future : responses.values()) {
SendEmail sendEmail = future.get();
assertNotNull(sendEmail);
- log.info("Persisted the SendEmail entity with the id {} and the
address {}", sendEmail.getId(), sendEmail.getAddress());
+ LOGGER.info("Persisted the SendEmail entity with the id {} and the
address {}", sendEmail.getId(), sendEmail.getAddress());
}
// assert in the database
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerFindEntityTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerFindEntityTest.java
index 62f661d..c79246d 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerFindEntityTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerFindEntityTest.java
@@ -19,10 +19,12 @@ package org.apache.camel.processor.jpa;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class JpaProducerFindEntityTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java
index b7c8aab..f15072e 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerNoBodyTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.InvalidPayloadRuntimeException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-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.fail;
public class JpaProducerNoBodyTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerPassingEntityManagerTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerPassingEntityManagerTest.java
index fc9856a..ea276bf 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerPassingEntityManagerTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerPassingEntityManagerTest.java
@@ -26,7 +26,10 @@ import org.apache.camel.component.jpa.JpaEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class JpaProducerPassingEntityManagerTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
index e1d2537..29842aa 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerRemoveTest.java
@@ -25,7 +25,10 @@ import org.apache.camel.component.jpa.JpaEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class JpaProducerRemoveTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
index 55e95a9..65ce33b 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
@@ -25,12 +25,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jpa.JpaConstants;
import org.apache.camel.examples.Customer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class JpaProducerWithQueryParametersHeaderTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class JpaProducerWithQueryParametersHeaderTest {
protected DefaultCamelContext camelContext;
protected ProducerTemplate template;
@@ -57,7 +58,7 @@ public class JpaProducerWithQueryParametersHeaderTest extends
Assert {
assertEquals(2, integer);
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
camelContext = new DefaultCamelContext();
@@ -79,7 +80,7 @@ public class JpaProducerWithQueryParametersHeaderTest extends
Assert {
template = camelContext.createProducerTemplate();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
camelContext.stop();
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
index 6e9f5c9..cf26a6c 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
@@ -26,12 +26,13 @@ import org.apache.camel.examples.Customer;
import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class JpaProducerWithQueryTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class JpaProducerWithQueryTest {
protected DefaultCamelContext camelContext;
protected ProducerTemplate template;
@@ -113,7 +114,7 @@ public class JpaProducerWithQueryTest extends Assert {
assertEquals(2, ((Integer)answer).intValue());
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
camelContext = new DefaultCamelContext();
SimpleRegistry registry = new SimpleRegistry();
@@ -150,7 +151,7 @@ public class JpaProducerWithQueryTest extends Assert {
template = camelContext.createProducerTemplate();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
camelContext.stop();
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java
index 13988c7..add2172 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteConsumeLockEntityTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JpaRouteConsumeLockEntityTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java
index abceb3d..7e88471 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteMaximumResultsTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JpaRouteMaximumResultsTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
@@ -38,7 +40,7 @@ public class JpaRouteMaximumResultsTest extends
AbstractJpaTest {
assertEntityInDB(3);
// should not consume 3 at once
- assertTrue("Should not consume all 3 at once",
mock.getReceivedCounter() < 3);
+ assertTrue(mock.getReceivedCounter() < 3, "Should not consume all 3 at
once");
}
@Override
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java
index 8f7b312..20e5aba 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java
@@ -27,9 +27,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.util.ObjectHelper;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.context.expression.BeanFactoryResolver;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -37,16 +36,18 @@ import
org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.orm.jpa.LocalEntityManagerFactoryBean;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class JpaRouteSharedEntityManagerTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
private CountDownLatch latch = new CountDownLatch(1);
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// Don't run on Hibernate
- Assume.assumeTrue(ObjectHelper.loadClass("org.hibernate.Hibernate") ==
null);
+ assumeTrue(ObjectHelper.loadClass("org.hibernate.Hibernate") == null);
super.setUp();
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
index 945afb2..815c932 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java
@@ -26,11 +26,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.VersionedItem;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-@Ignore("Need the fix of OPENJPA-2461")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("Need the fix of OPENJPA-2461")
public class JpaRouteSkipLockedEntityTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
VersionedItem.class.getName() + " x";
@@ -107,7 +109,7 @@ public class JpaRouteSkipLockedEntityTest extends
AbstractJpaTest {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
setLockTimeout(0);
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
index 20690ff..89af4d9 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteTest.java
@@ -24,7 +24,9 @@ import org.apache.camel.component.jpa.JpaConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JpaRouteTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
@@ -33,8 +35,8 @@ public class JpaRouteTest extends AbstractJpaTest {
public void testRouteJpa() throws Exception {
// should auto setup transaction manager and entity factory
JpaComponent jpa = context.getComponent("jpa", JpaComponent.class);
- assertNotNull("Should have been auto assigned",
jpa.getEntityManagerFactory());
- assertNotNull("Should have been auto assigned",
jpa.getTransactionManager());
+ assertNotNull(jpa.getEntityManagerFactory(), "Should have been auto
assigned");
+ assertNotNull(jpa.getTransactionManager(), "Should have been auto
assigned");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java
index a6ffbab..aa5a612 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRoutemaxMessagesPerPollTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JpaRoutemaxMessagesPerPollTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
index d71d3c3..082f59a 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaTXRollbackTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JpaTXRollbackTest extends AbstractJpaTest {
@@ -48,8 +50,8 @@ public class JpaTXRollbackTest extends AbstractJpaTest {
assertMockEndpointsSatisfied();
- assertTrue("Should be >= 2, was: " + foo.intValue(), foo.intValue() >=
2);
- assertTrue("Should be >= 2, was: " + bar.intValue(), bar.intValue() >=
2);
+ assertTrue(foo.intValue() >= 2, "Should be >= 2, was: " +
foo.intValue());
+ assertTrue(bar.intValue() >= 2, "Should be >= 2, was: " +
bar.intValue());
}
@Override
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaWireTapTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaWireTapTest.java
index 9cc53b3..652bcce 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaWireTapTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaWireTapTest.java
@@ -21,7 +21,9 @@ import org.apache.camel.component.jpa.JpaComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JpaWireTapTest extends AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
SendEmail.class.getName() + " x";
@@ -30,8 +32,8 @@ public class JpaWireTapTest extends AbstractJpaTest {
public void testRouteJpa() throws Exception {
// should auto setup transaction manager and entity factory
JpaComponent jpa = context.getComponent("jpa", JpaComponent.class);
- assertNotNull("Should have been auto assigned",
jpa.getEntityManagerFactory());
- assertNotNull("Should have been auto assigned",
jpa.getTransactionManager());
+ assertNotNull(jpa.getEntityManagerFactory(), "Should have been auto
assigned");
+ assertNotNull(jpa.getTransactionManager(), "Should have been auto
assigned");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
