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

[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 f2431e1adc392d7fa6d62f63456e94d72a04461f
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Jun 12 08:51:08 2024 +0200

    CAMEL-20838: do not use overrides when JUnit's annotations suffice 
(camel-jcr)
---
 .../test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java | 7 +++----
 .../org/apache/camel/component/jcr/JcrNodePathCreationTest.java   | 5 +++--
 .../component/jcr/JcrRouteDifferentWorkspaceTestSupport.java      | 8 +++-----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
index 3179abebf94..58a28619b2a 100644
--- 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
+++ 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.TransientRepository;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 
 import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
 
@@ -46,9 +46,8 @@ public abstract class JcrAuthTestBase extends 
CamelTestSupport {
 
     private static Repository repository = new TransientRepository(new 
File(REPO_PATH));
 
-    @Override
-    @BeforeEach
-    public void doPostSetup() {
+    @BeforeAll
+    public static void cleanupDirectory() {
         deleteDirectory(REPO_PATH);
     }
 
diff --git 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
index b44b536e01e..8cda5256f97 100644
--- 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
+++ 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrNodePathCreationTest.java
@@ -23,6 +23,7 @@ import javax.jcr.ValueFactory;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -34,8 +35,8 @@ public class JcrNodePathCreationTest extends 
JcrRouteTestSupport {
 
     private Value[] multiValued;
 
-    @Override
-    public void doPreSetup() throws Exception {
+    @BeforeEach
+    public void setupCredentials() throws Exception {
         Session session = openSession();
 
         ValueFactory valFact = session.getValueFactory();
diff --git 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
index 6f20346aceb..7e7ea2ebaa0 100644
--- 
a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
+++ 
b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrRouteDifferentWorkspaceTestSupport.java
@@ -45,15 +45,13 @@ public abstract class JcrRouteDifferentWorkspaceTestSupport 
extends CamelTestSup
 
     private Repository repository;
 
-    @Override
     @BeforeEach
-    public void doPreSetup() {
+    public void cleanupDirectory() {
         deleteDirectory(REPO_PATH);
-
     }
 
-    @Override
-    protected void doPostSetup() throws Exception {
+    @BeforeEach
+    protected void setupBeans() throws Exception {
         Session session = getRepository().login(new SimpleCredentials("user", 
"pass".toCharArray()));
         Workspace workspace = session.getWorkspace();
         workspace.createWorkspace(CUSTOM_WORKSPACE_NAME);