Skip to content

Commit d5fe319

Browse files
apupierapupier
committed
Replace deprecated methods in tests of mina-sftp
Signed-off-by: Aurélien Pupier <apupier@ibm.com>
1 parent 2067026 commit d5fe319

19 files changed

Lines changed: 40 additions & 60 deletions

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpAdvancedFileOperationsIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.camel.component.file.GenericFileOperationFailedException;
2828
import org.apache.camel.component.mock.MockEndpoint;
2929
import org.junit.jupiter.api.AfterEach;
30-
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.Test;
3231
import org.junit.jupiter.api.Timeout;
3332
import org.junit.jupiter.api.condition.EnabledIf;
@@ -55,8 +54,8 @@ public class MinaSftpAdvancedFileOperationsIT extends MinaSftpServerTestSupport
5554

5655
private Path brokenSymlink;
5756

58-
@BeforeEach
59-
public void doPostSetup() {
57+
@Override
58+
protected void setupResources() throws Exception {
6059
service.getFtpRootDir().toFile().mkdirs();
6160
ftpRootDir = service.getFtpRootDir().toString();
6261
// Generate unique ID for each test run to avoid file conflicts between retries

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpAuthenticationIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.apache.camel.CamelExecutionException;
2222
import org.apache.camel.Exchange;
2323
import org.apache.camel.component.file.GenericFileOperationFailedException;
24-
import org.junit.jupiter.api.BeforeEach;
2524
import org.junit.jupiter.api.Test;
2625
import org.junit.jupiter.api.condition.EnabledIf;
2726

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

3736
private String ftpRootDir;
3837

39-
@BeforeEach
40-
public void doPostSetup() throws Exception {
38+
@Override
39+
protected void setupResources() throws Exception {
4140
// Ensure the root directory exists
4241
service.getFtpRootDir().toFile().mkdirs();
4342
ftpRootDir = service.getFtpRootDir().toString();

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpConcurrencyIT.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import java.util.concurrent.atomic.AtomicInteger;
2727

2828
import org.apache.camel.Exchange;
29-
import org.junit.jupiter.api.AfterEach;
30-
import org.junit.jupiter.api.BeforeEach;
3129
import org.junit.jupiter.api.Tag;
3230
import org.junit.jupiter.api.Test;
3331
import org.junit.jupiter.api.Timeout;
@@ -53,15 +51,15 @@ public class MinaSftpConcurrencyIT extends MinaSftpServerTestSupport {
5351
private String ftpRootDir;
5452
private ExecutorService executor;
5553

56-
@BeforeEach
57-
public void doPostSetup() {
54+
@Override
55+
protected void setupResources() throws Exception {
5856
service.getFtpRootDir().toFile().mkdirs();
5957
ftpRootDir = service.getFtpRootDir().toString();
6058
executor = Executors.newFixedThreadPool(THREAD_COUNT);
6159
}
6260

63-
@AfterEach
64-
public void doPostTearDown() {
61+
@Override
62+
protected void cleanupResources() throws Exception {
6563
if (executor != null) {
6664
executor.shutdownNow();
6765
}

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpConfigurationValidationIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.camel.RuntimeCamelException;
2828
import org.apache.sshd.common.util.io.PathUtils;
2929
import org.junit.jupiter.api.AfterAll;
30-
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.Tag;
3231
import org.junit.jupiter.api.Test;
3332
import org.junit.jupiter.api.Timeout;
@@ -107,8 +106,8 @@ static void teardownTestHome() {
107106
log.info("Reset home directory resolution to default");
108107
}
109108

110-
@BeforeEach
111-
public void doPostSetup() {
109+
@Override
110+
protected void setupResources() throws Exception {
112111
service.getFtpRootDir().toFile().mkdirs();
113112
ftpRootDir = service.getFtpRootDir().toString();
114113
}

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpCustomServerKeyVerifierIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.camel.component.file.GenericFileOperationFailedException;
2929
import org.apache.sshd.client.keyverifier.ServerKeyVerifier;
3030
import org.apache.sshd.client.session.ClientSession;
31-
import org.junit.jupiter.api.BeforeEach;
3231
import org.junit.jupiter.api.Test;
3332
import org.junit.jupiter.api.condition.EnabledIf;
3433

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

4645
private String ftpRootDir;
4746

48-
@BeforeEach
49-
public void doPostSetup() throws Exception {
47+
@Override
48+
protected void setupResources() throws Exception {
5049
service.getFtpRootDir().toFile().mkdirs();
5150
ftpRootDir = service.getFtpRootDir().toString();
5251
}

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpDeleteFileIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.camel.component.file.remote.RemoteFileOperations;
2424
import org.apache.camel.component.file.remote.SftpRemoteFile;
2525
import org.apache.camel.component.file.remote.mina.MinaSftpEndpoint;
26-
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
2827
import org.junit.jupiter.api.condition.EnabledIf;
2928

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

4039
private String ftpRootDir;
4140

42-
@BeforeEach
43-
public void doPostSetup() throws Exception {
41+
@Override
42+
protected void setupResources() throws Exception {
4443
// Ensure the root directory exists
4544
service.getFtpRootDir().toFile().mkdirs();
4645
ftpRootDir = service.getFtpRootDir().toString();

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpErrorHandlingIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.camel.builder.RouteBuilder;
2424
import org.apache.camel.component.file.GenericFileOperationFailedException;
2525
import org.apache.camel.component.mock.MockEndpoint;
26-
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
2827
import org.junit.jupiter.api.Timeout;
2928
import org.junit.jupiter.api.condition.EnabledIf;
@@ -40,8 +39,8 @@ public class MinaSftpErrorHandlingIT extends MinaSftpServerTestSupport {
4039

4140
private String ftpRootDir;
4241

43-
@BeforeEach
44-
public void doPostSetup() {
42+
@Override
43+
protected void setupResources() throws Exception {
4544
service.getFtpRootDir().toFile().mkdirs();
4645
ftpRootDir = service.getFtpRootDir().toString();
4746
}

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpHostKeyVerificationIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.camel.component.file.GenericFileOperationFailedException;
2626
import org.apache.camel.component.file.remote.mina.MinaSftpConfiguration;
2727
import org.apache.camel.component.file.remote.mina.MinaSftpEndpoint;
28-
import org.junit.jupiter.api.BeforeEach;
2928
import org.junit.jupiter.api.Test;
3029
import org.junit.jupiter.api.condition.EnabledIf;
3130
import org.junit.jupiter.api.io.TempDir;
@@ -50,8 +49,8 @@ public class MinaSftpHostKeyVerificationIT extends MinaSftpServerTestSupport {
5049
@TempDir
5150
Path tempDir;
5251

53-
@BeforeEach
54-
public void doPostSetup() throws Exception {
52+
@Override
53+
protected void setupResources() throws Exception {
5554
service.getFtpRootDir().toFile().mkdirs();
5655
ftpRootDir = service.getFtpRootDir().toString();
5756
}

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpLargeFileIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.apache.camel.Exchange;
2828
import org.apache.camel.builder.RouteBuilder;
2929
import org.apache.camel.component.mock.MockEndpoint;
30-
import org.junit.jupiter.api.BeforeEach;
3130
import org.junit.jupiter.api.Test;
3231
import org.junit.jupiter.api.Timeout;
3332
import org.junit.jupiter.api.condition.EnabledIf;
@@ -47,8 +46,8 @@ public class MinaSftpLargeFileIT extends MinaSftpServerTestSupport {
4746

4847
private String ftpRootDir;
4948

50-
@BeforeEach
51-
public void doPostSetup() {
49+
@Override
50+
protected void setupResources() throws Exception {
5251
service.getFtpRootDir().toFile().mkdirs();
5352
ftpRootDir = service.getFtpRootDir().toString();
5453
}

‎components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpListFilesIT.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.nio.file.Files;
2121

2222
import org.apache.camel.Exchange;
23-
import org.junit.jupiter.api.BeforeEach;
2423
import org.junit.jupiter.api.Test;
2524
import org.junit.jupiter.api.condition.EnabledIf;
2625

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

3635
private String ftpRootDir;
3736

38-
@BeforeEach
39-
public void doPostSetup() throws Exception {
37+
@Override
38+
protected void setupResources() throws Exception {
4039
// Ensure the root directory exists
4140
service.getFtpRootDir().toFile().mkdirs();
4241
ftpRootDir = service.getFtpRootDir().toString();

0 commit comments

Comments
 (0)