CAMEL-16488: ensure resource setup/cleanup on the right time

components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpServerTestSupport.java

@@ -31,7 +31,7 @@
 public abstract class FtpServerTestSupport extends BaseServerTestSupport {
 
     @RegisterExtension
-    static FtpEmbeddedService service = new FtpEmbeddedService();
+    public FtpEmbeddedService service = new FtpEmbeddedService();
 
     public void sendFile(String url, Object body, String fileName) {
         template.sendBodyAndHeader(url, body, Exchange.FILE_NAME, simple(fileName));

components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpServerTestSupport.java

@@ -24,7 +24,7 @@
 
 public class SftpServerTestSupport extends BaseServerTestSupport {
     @RegisterExtension
-    protected static SftpEmbeddedService service = new SftpEmbeddedService();
+    protected SftpEmbeddedService service = new SftpEmbeddedService();
 
     protected Path ftpFile(String file) {
         return service.getFtpRootDir().resolve(file);

test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/AbstractTestService.java

@@ -19,19 +19,8 @@
 import java.util.function.BiConsumer;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
 
-public abstract class AbstractTestService implements TestService, BeforeAllCallback, AfterAllCallback {
-
-    protected ExtensionContext context;
-
-    @Override
-    public void registerProperties() {
-        ExtensionContext.Store store = context.getStore(ExtensionContext.Namespace.GLOBAL);
-        registerProperties(store::put);
-    }
+public abstract class AbstractTestService implements TestService {
 
     @Override
     public void initialize() {
@@ -52,25 +41,13 @@ public void shutdown() {
         }
     }
 
-    protected void registerProperties(BiConsumer<String, String> store) {
-    }
+    protected abstract void registerProperties(BiConsumer<String, String> store);
 
+    @Deprecated
     protected void setUp() throws Exception {
     }
 
+    @Deprecated
     protected void tearDown() throws Exception {
     }
-
-    @Override
-    public void beforeAll(ExtensionContext extensionContext) throws Exception {
-        this.context = extensionContext;
-        initialize();
-    }
-
-    @Override
-    public void afterAll(ExtensionContext extensionContext) throws Exception {
-        shutdown();
-        this.context = null;
-    }
-
 }

test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpRemoteService.java

@@ -16,20 +16,6 @@
  */
 package org.apache.camel.test.infra.ftp.services;
 
-public class FtpRemoteService implements FtpService {
+public interface FtpRemoteService extends FtpService {
 
-    @Override
-    public void registerProperties() {
-        // NO-OP
-    }
-
-    @Override
-    public void initialize() {
-        registerProperties();
-    }
-
-    @Override
-    public void shutdown() {
-        // NO-OP
-    }
 }

test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpService.java

@@ -18,21 +18,13 @@
 
 import org.apache.camel.test.infra.common.services.TestService;
 import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
 
 /**
  * Test infra service for Ftp
  */
-public interface FtpService extends BeforeAllCallback, AfterAllCallback, TestService {
+public interface FtpService extends TestService, BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
 
-    @Override
-    default void beforeAll(ExtensionContext extensionContext) throws Exception {
-        initialize();
-    }
-
-    @Override
-    default void afterAll(ExtensionContext extensionContext) throws Exception {
-        shutdown();
-    }
 }

test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/FtpServiceFactory.java

@@ -17,6 +17,7 @@
 package org.apache.camel.test.infra.ftp.services;
 
 import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.ftp.services.embedded.FtpEmbeddedService;
 
 public final class FtpServiceFactory {
 
@@ -30,7 +31,7 @@ public static SimpleTestServiceBuilder<FtpService> builder() {
 
     public static FtpService createService() {
         return builder()
-                .addRemoteMapping(FtpRemoteService::new)
+                .addLocalMapping(FtpEmbeddedService::new)
                 .build();
     }
 }

test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/FtpEmbeddedService.java

@@ -42,6 +42,7 @@
 import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
 import org.apache.ftpserver.usermanager.impl.BaseUser;
 import org.apache.ftpserver.usermanager.impl.WritePermission;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,8 +57,8 @@ public class FtpEmbeddedService extends AbstractTestService implements FtpServic
 
     protected Path rootDir;
     private final EmbeddedConfigurationBuilder embeddedConfigurationTemplate;
+    private ExtensionContext context;
 
-    @Deprecated
     public FtpEmbeddedService() {
         this(EmbeddedConfigurationBuilder.defaultConfigurationTemplate());
     }
@@ -126,6 +127,7 @@ protected FtpServerFactory createFtpServerFactory(EmbeddedConfiguration embedded
         ListenerFactory factory = new ListenerFactory();
         factory.setPort(port);
         factory.setServerAddress(embeddedConfiguration.getServerAddress());
+
         final Listener listener = factory.createListener();
 
         serverFactory.addListener(DEFAULT_LISTENER, listener);
@@ -172,6 +174,12 @@ protected void registerProperties(BiConsumer<String, String> store) {
         store.accept(FtpProperties.ROOT_DIR, rootDir.toString());
     }
 
+    @Override
+    public void registerProperties() {
+        ExtensionContext.Store store = context.getStore(ExtensionContext.Namespace.GLOBAL);
+        registerProperties(store::put);
+    }
+
     public Path getFtpRootDir() {
         return rootDir;
     }
@@ -201,4 +209,26 @@ public int countConnections() {
 
         return count;
     }
+
+    @Override
+    public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        this.context = extensionContext;
+    }
+
+    @Override
+    public void afterAll(ExtensionContext extensionContext) throws Exception {
+        this.context = null;
+    }
+
+    @Override
+    public void afterEach(ExtensionContext extensionContext) throws Exception {
+        shutdown();
+        this.context = null;
+    }
+
+    @Override
+    public void beforeEach(ExtensionContext extensionContext) throws Exception {
+        this.context = extensionContext;
+        initialize();
+    }
 }

test-infra/camel-test-infra-ftp/src/test/java/org/apache/camel/test/infra/ftp/services/embedded/SftpEmbeddedService.java

@@ -40,6 +40,7 @@
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
 import org.apache.sshd.sftp.server.SftpSubsystemFactory;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,6 +54,7 @@ public class SftpEmbeddedService extends AbstractTestService implements FtpServi
     private Path rootDir;
     private Path knownHosts;
     private final EmbeddedConfiguration embeddedConfiguration;
+    private ExtensionContext context;
 
     public SftpEmbeddedService() {
         this(false);
@@ -164,7 +166,35 @@ protected void registerProperties(BiConsumer<String, String> store) {
         store.accept(FtpProperties.ROOT_DIR, rootDir.toString());
     }
 
+    @Override
+    public void registerProperties() {
+        ExtensionContext.Store store = context.getStore(ExtensionContext.Namespace.GLOBAL);
+        registerProperties(store::put);
+    }
+
     public int getPort() {
         return port;
     }
+
+    @Override
+    public void beforeAll(ExtensionContext extensionContext) throws Exception {
+        this.context = extensionContext;
+    }
+
+    @Override
+    public void afterAll(ExtensionContext extensionContext) throws Exception {
+        this.context = null;
+    }
+
+    @Override
+    public void afterEach(ExtensionContext extensionContext) throws Exception {
+        shutdown();
+        this.context = null;
+    }
+
+    @Override
+    public void beforeEach(ExtensionContext extensionContext) throws Exception {
+        this.context = extensionContext;
+        initialize();
+    }
 }