This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4fd8467b1e34e8ea5bf638ac2d5f825a218e9b2e
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Sat Jun 15 08:19:09 2024 +0200
CAMEL-20838: do not use overrides when JUnit's annotations suffice
(camel-jpa)
---
.../org/apache/camel/component/jpa/AbstractJpaMethodSupport.java | 3 +--
.../test/java/org/apache/camel/processor/jpa/AbstractJpaTest.java | 8 ++------
.../apache/camel/processor/jpa/FileConsumerJpaIdempotentTest.java | 8 +++++---
.../org/apache/camel/processor/jpa/JpaIdempotentConsumerTest.java | 4 +---
.../camel/processor/jpa/JpaPollingConsumerLockEntityTest.java | 5 +----
.../camel/processor/jpa/JpaRouteSharedEntityManagerTest.java | 8 +++-----
.../apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java | 4 +---
7 files changed, 14 insertions(+), 26 deletions(-)
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java
index 0eaa0bd79be..12283da28ff 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/AbstractJpaMethodSupport.java
@@ -38,9 +38,8 @@ public class AbstractJpaMethodSupport extends
CamelTestSupport {
protected TransactionTemplate transactionTemplate;
protected Consumer consumer;
- @Override
@AfterEach
- public void tearDown() {
+ public void closeEntityManager() {
if (entityManager != null) {
entityManager.close();
}
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 e7f53160a77..46b9a02c09e 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
@@ -41,10 +41,8 @@ public abstract class AbstractJpaTest extends
CamelTestSupport {
protected TransactionTemplate transactionTemplate;
protected EntityManager entityManager;
- @Override
@BeforeEach
- public void setUp() throws Exception {
- super.setUp();
+ public void setupEntityManager() {
EntityManagerFactory entityManagerFactory =
applicationContext.getBean("entityManagerFactory",
EntityManagerFactory.class);
transactionTemplate =
applicationContext.getBean("transactionTemplate", TransactionTemplate.class);
@@ -52,10 +50,8 @@ public abstract class AbstractJpaTest extends
CamelTestSupport {
cleanupRepository();
}
- @Override
@AfterEach
- public void tearDown() throws Exception {
- super.tearDown();
+ public void cleanupEntityManager() {
if (entityManager != null) {
entityManager.close();
}
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 17ed6e0d9d9..5668c5f6053 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
@@ -41,11 +41,13 @@ public class FileConsumerJpaIdempotentTest extends
AbstractJpaTest {
= "select x from " + MessageProcessed.class.getName() + " x where
x.processorName = ?1";
protected static final String PROCESSOR_NAME = "FileConsumer";
- @Override
@BeforeEach
- public void setUp() throws Exception {
+ public void cleanupDir() {
deleteDirectory("target/idempotent");
- super.setUp();
+ }
+
+ @BeforeEach
+ public void setMessages() {
template.sendBodyAndHeader("file://target/idempotent/", "Hello World",
Exchange.FILE_NAME, "report.txt");
}
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 ff4ca6526fb..7edc71ca099 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
@@ -69,10 +69,8 @@ public class JpaIdempotentConsumerTest extends
AbstractJpaTest {
});
}
- @Override
@BeforeEach
- public void setUp() throws Exception {
- super.setUp();
+ public void setEndpoints() {
startEndpoint = resolveMandatoryEndpoint("direct:start");
resultEndpoint = getMockEndpoint("mock:result");
}
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 f67f1f343a5..3cc1bff20db 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
@@ -34,10 +34,7 @@ public class JpaPollingConsumerLockEntityTest extends
AbstractJpaTest {
protected static final String SELECT_ALL_STRING = "select x from " +
Customer.class.getName() + " x";
@BeforeEach
- @Override
- public void setUp() throws Exception {
- super.setUp();
-
+ public void setupBeans() {
Customer customer = new Customer();
customer.setName("Donald Duck");
saveEntityInDB(customer);
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 2937ceda539..37011c56344 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
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.util.ObjectHelper;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.context.expression.BeanFactoryResolver;
import org.springframework.expression.Expression;
@@ -42,12 +42,10 @@ 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
- @BeforeEach
- public void setUp() throws Exception {
+ @BeforeAll
+ public static void hibernateCheck() {
// Don't run on Hibernate
assumeTrue(ObjectHelper.loadClass("org.hibernate.Hibernate") == null);
- super.setUp();
}
@Test
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 a8b26953e14..d077f8d464c 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
@@ -109,10 +109,8 @@ public class JpaRouteSkipLockedEntityTest extends
AbstractJpaTest {
}
}
- @Override
@BeforeEach
- public void setUp() throws Exception {
- super.setUp();
+ public void setupTimeout() throws SQLException {
setLockTimeout(0);
}
