Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand Down Expand Up @@ -55,8 +54,8 @@ public class MinaSftpAdvancedFileOperationsIT extends MinaSftpServerTestSupport

private Path brokenSymlink;

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
// Generate unique ID for each test run to avoid file conflicts between retries
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -36,8 +35,8 @@ public class MinaSftpAuthenticationIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
// Ensure the root directory exists
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import java.util.concurrent.atomic.AtomicInteger;

import org.apache.camel.Exchange;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
Expand All @@ -53,15 +51,15 @@ public class MinaSftpConcurrencyIT extends MinaSftpServerTestSupport {
private String ftpRootDir;
private ExecutorService executor;

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
executor = Executors.newFixedThreadPool(THREAD_COUNT);
}

@AfterEach
public void doPostTearDown() {
@Override
protected void cleanupResources() throws Exception {
if (executor != null) {
executor.shutdownNow();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.camel.RuntimeCamelException;
import org.apache.sshd.common.util.io.PathUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
Expand Down Expand Up @@ -107,8 +106,8 @@ static void teardownTestHome() {
log.info("Reset home directory resolution to default");
}

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
import org.apache.sshd.client.session.ClientSession;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -45,8 +44,8 @@ public class MinaSftpCustomServerKeyVerifierIT extends MinaSftpServerTestSupport

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.camel.component.file.remote.RemoteFileOperations;
import org.apache.camel.component.file.remote.SftpRemoteFile;
import org.apache.camel.component.file.remote.mina.MinaSftpEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -39,8 +38,8 @@ public class MinaSftpDeleteFileIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
// Ensure the root directory exists
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand All @@ -40,8 +39,8 @@ public class MinaSftpErrorHandlingIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.remote.mina.MinaSftpConfiguration;
import org.apache.camel.component.file.remote.mina.MinaSftpEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.io.TempDir;
Expand All @@ -50,8 +49,8 @@ public class MinaSftpHostKeyVerificationIT extends MinaSftpServerTestSupport {
@TempDir
Path tempDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand All @@ -47,8 +46,8 @@ public class MinaSftpLargeFileIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.nio.file.Files;

import org.apache.camel.Exchange;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -35,8 +34,8 @@ public class MinaSftpListFilesIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
// Ensure the root directory exists
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand Down Expand Up @@ -61,8 +60,8 @@ public class MinaSftpProducerConsumerFeaturesIT extends MinaSftpServerTestSuppor
@TempDir
Path localWorkDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
LOG.info("FTP root directory: {}", ftpRootDir);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand All @@ -47,8 +46,8 @@ public class MinaSftpProtocolIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.remote.mina.MinaSftpConfiguration;
import org.apache.camel.component.file.remote.mina.MinaSftpEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.EnabledIf;
Expand All @@ -42,8 +41,8 @@ public class MinaSftpPublicKeyAuthIT extends MinaSftpServerTestSupport {

private static final String TEST_RESOURCES = "src/test/resources/";

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
// Ensure the root directory exists
service.getFtpRootDir().toFile().mkdirs();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.component.file.remote.mina.MinaSftpConfiguration;
import org.apache.camel.component.file.remote.mina.MinaSftpEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand All @@ -43,8 +42,8 @@ public class MinaSftpSecurityEdgeCasesIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.nio.file.Files;

import org.apache.camel.Exchange;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -36,8 +35,8 @@ public class MinaSftpSimpleConsumeIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
// Ensure the root directory exists
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.io.File;

import org.apache.camel.Exchange;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -31,8 +30,8 @@ public class MinaSftpSimpleProduceIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
// Ensure the root directory exists
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.EnabledIf;
Expand Down Expand Up @@ -52,8 +51,8 @@ public class MinaSftpSymlinkIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
LOG.info("FTP root directory: {}", ftpRootDir);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.camel.component.file.remote.mina.integration;

import org.apache.camel.Exchange;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;

Expand All @@ -38,8 +37,8 @@ public class MinaSftpUnsupportedFeaturesIT extends MinaSftpServerTestSupport {

private String ftpRootDir;

@BeforeEach
public void doPostSetup() throws Exception {
@Override
protected void setupResources() throws Exception {
service.getFtpRootDir().toFile().mkdirs();
ftpRootDir = service.getFtpRootDir().toString();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import static org.awaitility.Awaitility.await;
Expand All @@ -43,8 +42,8 @@ protected String getFtpUrl() {
}

@Override
@BeforeEach
public void doPostSetup() throws Exception {
protected void setupResources() throws Exception {
super.setupResources();
createSampleFile();
}

Expand Down