(camel) 11/13: CAMEL-20838: do not use overrides when JUnit's annotations suffice (camel-itest)

[orpiske]

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 4d116a10ff10e5f82979174e83d7f90e19c8b04b
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Jun 17 10:30:26 2024 +0200

    CAMEL-20838: do not use overrides when JUnit's annotations suffice 
(camel-itest)
---
 .../itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java    |  3 +--
 .../itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java  | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
index 0c28a7ed3c9..3dc42e8cf36 100644
--- 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
+++ 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java
@@ -64,9 +64,8 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends 
CamelSpringTestSup
         return new 
ClassPathXmlApplicationContext("org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.xml");
     }
 
-    @Override
     @BeforeEach
-    public void doPostSetup() {
+    public void setupDataSources() {
         DataSource dataSource = 
context.getRegistry().lookupByNameAndType(getDatasourceName(), 
DataSource.class);
         jdbcTemplate = new JdbcTemplate(dataSource);
         jdbcTemplate.afterPropertiesSet();
diff --git 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
index 937ef7c8785..ae093d09f1e 100644
--- 
a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
+++ 
b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java
@@ -20,6 +20,8 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 
 import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -36,13 +38,13 @@ public class FromJmsToJdbcIdempotentConsumerToJmsXaTest 
extends FromJmsToJdbcIde
     @RegisterExtension
     public static JmsServiceExtension jmsServiceExtension = 
JmsServiceExtension.createExtension();
 
-    @Override
-    public void doPreSetup() {
+    @BeforeEach
+    public void cleanupDirectories() {
         deleteDirectory("target/testdb");
     }
 
-    @Override
-    public void doPostTearDown() {
+    @AfterEach
+    public void shutdownDatabase() {
         // shutdown the embedded Derby database so that the next test becomes 
a clean initial state
         try {
             
DriverManager.getConnection("jdbc:derby:target/testdb;shutdown=true");