This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e14afec (chores) Improve logging in camel-ftp tests to debug CI
issues (#4731)
e14afec is described below
commit e14afeca88476bf05f8801f3798954c5af5feebc
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Mon Dec 7 16:47:56 2020 +0100
(chores) Improve logging in camel-ftp tests to debug CI issues (#4731)
---
.../remote/FromFtpDirectoryToBinaryFilesTest.java | 33 ++++++++++++++--------
.../file/remote/FtpsServerTestSupport.java | 7 +++++
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
index bf445bf..a77e1e4 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpDirectoryToBinaryFilesTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.converter.IOConverter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -32,6 +33,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* path. Based on CAMEL-834.
*/
public class FromFtpDirectoryToBinaryFilesTest extends FtpServerTestSupport {
+ private File logoFile;
+ private long logoFileSize;
+ private File logo1File;
+ private long logo1FileSize;
private String getFtpUrl() {
return "ftp://admin@localhost:"; + getPort() +
"/incoming/?password=admin"
@@ -42,7 +47,15 @@ public class FromFtpDirectoryToBinaryFilesTest extends
FtpServerTestSupport {
@BeforeEach
public void setUp() throws Exception {
super.setUp();
+
+ logoFile = IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg");
+ logoFileSize = logoFile.length();
+
+ logo1File =
IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg");
+ logo1FileSize = logo1File.length();
+
prepareFtpServer();
+
}
@Test
@@ -53,27 +66,25 @@ public class FromFtpDirectoryToBinaryFilesTest extends
FtpServerTestSupport {
Exchange ex = resultEndpoint.getExchanges().get(0);
byte[] bytes = ex.getIn().getBody(byte[].class);
- assertTrue(bytes.length > 10000, "Logo size wrong");
+ assertTrue(bytes.length > 10000, "Logo size wrong: " + bytes.length);
// assert the file
- File file = new File("target/ftptest/logo1.jpeg");
- assertTrue(file.exists(), "The binary file should exists");
- assertTrue(file.length() > 10000, "Logo size wrong");
+ File logo1DestFile = new File("target/ftptest/logo1.jpeg");
+ assertTrue(logo1DestFile.exists(), "The binary file should exists");
+ assertEquals(logo1FileSize, logo1DestFile.length(), "File size for
logo1.jpg does not match");
// assert the file
- file = new File("target/ftptest/logo.jpeg");
- assertTrue(file.exists(), " The binary file should exists");
- assertTrue(file.length() > 10000, "Logo size wrong");
+ File logoDestFile = new File("target/ftptest/logo.jpeg");
+ assertTrue(logoDestFile.exists(), " The binary file should exists");
+ assertEquals(logoFileSize, logoDestFile.length(), "File size for
logo1.jpg does not match");
}
private void prepareFtpServer() throws Exception {
// prepares the FTP Server by creating a file on the server that we
want
// to unit
// test that we can pool and store as a local file
- template.sendBodyAndHeader(getFtpUrl(),
IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"), Exchange.FILE_NAME,
- "logo.jpeg");
- template.sendBodyAndHeader(getFtpUrl(),
IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"),
- Exchange.FILE_NAME, "logo1.jpeg");
+ template.sendBodyAndHeader(getFtpUrl(), logoFile, Exchange.FILE_NAME,
"logo.jpeg");
+ template.sendBodyAndHeader(getFtpUrl(), logo1File, Exchange.FILE_NAME,
"logo1.jpeg");
}
@Override
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
index eb3d1d6..b883ac9 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsServerTestSupport.java
@@ -19,6 +19,9 @@ package org.apache.camel.component.file.remote;
import java.io.File;
import java.security.NoSuchAlgorithmException;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.TrustManagerFactory;
+
import org.apache.camel.util.ObjectHelper;
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.listener.ListenerFactory;
@@ -44,6 +47,9 @@ public abstract class FtpsServerTestSupport extends
FtpServerTestSupport {
@Override
protected FtpServerFactory createFtpServerFactory() throws Exception {
try {
+ LOG.info("KeyManagerFactory using the default algorithm {}",
KeyManagerFactory.getDefaultAlgorithm());
+ LOG.info("TrustManagerFactory using the default algorithm {}",
TrustManagerFactory.getDefaultAlgorithm());
+
return doCreateFtpServerFactory();
} catch (Exception e) {
// ignore if algorithm is not on the OS
@@ -84,6 +90,7 @@ public abstract class FtpsServerTestSupport extends
FtpServerTestSupport {
sslConfigFactory.setKeystoreFile(FTPSERVER_KEYSTORE);
sslConfigFactory.setKeystoreType("JKS");
+
sslConfigFactory.setKeystoreAlgorithm("SunX509");
sslConfigFactory.setKeystorePassword(FTPSERVER_KEYSTORE_PASSWORD);
sslConfigFactory.setKeyPassword(FTPSERVER_KEYSTORE_PASSWORD);
