This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d5cb71da3bd9 CAMEL-21438: Re-enable disabled flaky FTPS and netty-http
tests (#23078)
d5cb71da3bd9 is described below
commit d5cb71da3bd9621751891e03731498947f7237c0
Author: Guillaume Nodet <[email protected]>
AuthorDate: Sat May 9 09:17:31 2026 +0200
CAMEL-21438: Re-enable disabled flaky FTPS and netty-http tests (#23078)
- Re-enable 12 FTPS integration tests (camel-ftp) that were disabled
since 2021 (CAMEL-16784). Migrated from SSLv3 (disabled in JDK 17+)
to TLSv1.2. This restores FTPS test coverage that was completely
absent for 4+ years.
- Re-enable ProxyProtocolTest (camel-netty-http, CAMEL-16718) by fixing
the uppercase() processor to use String conversion instead of manual
ByteBuf ref-count management, which caused a double-release detected
by Camel's error handling.
- Keep 5 TLS 1.3 FTPS tests disabled with accurate annotation (embedded
Apache FtpServer does not support TLS 1.3).
- Update misleading @Disabled annotations on 16 tests whose JIRAs are
resolved but tests should remain disabled:
- camel-csimple-joor (11): csimple code generator limitations
- camel-olingo4 (2): component deprecated, upstream in Apache Attic
- camel-xchange (3): WireMock does not cover Binance futures API
All re-enabled tests verified stable over 100 consecutive iterations
(2700 total executions, 0 failures).
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
---
.../language/csimple/joor/OriginalSimpleTest.java | 22 +++++++++++-----------
.../FileToFtpsExplicitSSLWithClientAuthIT.java | 6 +++---
...tClientAuthAndGlobalSSLContextParametersIT.java | 2 +-
...WithoutClientAuthAndSSLContextParametersIT.java | 2 +-
.../FileToFtpsExplicitSSLWithoutClientAuthIT.java | 4 +---
.../FileToFtpsExplicitTLSWithClientAuthIT.java | 2 +-
.../FileToFtpsExplicitTLSWithoutClientAuthIT.java | 2 +-
...SSLWithClientAuthAndSSLContextParametersIT.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthIT.java | 4 +---
...WithoutClientAuthAndSSLContextParametersIT.java | 2 +-
.../FileToFtpsImplicitSSLWithoutClientAuthIT.java | 4 +---
.../FileToFtpsImplicitTLSWithClientAuthIT.java | 2 +-
.../FileToFtpsImplicitTLSWithoutClientAuthIT.java | 2 +-
...FtpsWithCustomKeyAndTrustStorePropertiesIT.java | 4 +---
...FileToFtpsWithCustomTrustStorePropertiesIT.java | 4 +---
.../FileToFtpsWithDefaultSettingsIT.java | 2 +-
.../FileToFtpsWithFtpClientConfigRefIT.java | 6 ++----
.../remote/integration/FtpsServerTestSupport.java | 2 +-
.../component/netty/http/ProxyProtocolTest.java | 13 +++----------
.../camel/component/olingo4/Olingo4AppAPITest.java | 4 ++--
.../xchange/account/AccountProducerTest.java | 2 +-
.../xchange/market/MarketDataProducerTest.java | 2 +-
.../xchange/metadata/MetaDataProducerTest.java | 2 +-
23 files changed, 39 insertions(+), 58 deletions(-)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index 6c663d941e01..3d2ee1787968 100644
---
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -404,7 +404,7 @@ public class OriginalSimpleTest extends LanguageTestSupport
{
assertExpression("${body[0][code]}", 4321);
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testOGNLBodyEmptyList() {
Map<String, List<String>> map = new HashMap<>();
@@ -1325,7 +1325,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertTrue(cause2.getMessage().startsWith("Index 3 out of bounds for
length 2"));
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOGNLOrderListOutOfBoundsWithNullSafe() {
List<OrderLine> lines = new ArrayList<>();
@@ -1338,7 +1338,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("${bodyAs(Order)?.getLines[3].getId}", null);
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOGNLOrderListOutOfBoundsWithNullSafeShorthand() {
List<OrderLine> lines = new ArrayList<>();
@@ -1351,7 +1351,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("${bodyAs(Order)?.lines[3].id}", null);
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOGNLOrderListNoMethodNameWithNullSafe() {
List<OrderLine> lines = new ArrayList<>();
@@ -1367,7 +1367,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertEquals("getRating", cause.getMethodName());
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOGNLOrderListNoMethodNameWithNullSafeShorthand() {
List<OrderLine> lines = new ArrayList<>();
@@ -1383,7 +1383,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertEquals("rating", cause.getMethodName());
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOGNLNullSafeToAvoidNPE() {
Animal tiger = new Animal("Tony the Tiger", 13);
@@ -1409,7 +1409,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
e.getMessage());
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOGNLNullSafeToAvoidNPEShorthand() {
Animal tiger = new Animal("Tony the Tiger", 13);
@@ -1528,7 +1528,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("${bodyAs(String).replace(\"$\", \"-\")}",
"foo-bar-baz");
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOgnlReplaceEscapedBackslashChar() {
exchange.getIn().setBody("foo\\bar\\baz");
@@ -1547,7 +1547,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("${bodyAs(String).replaceFirst(\"http:\",\" \")}", "
camel.apache.org");
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testBodyOgnlReplaceSingleQuoteInDouble() {
exchange.getIn().setBody("Hello O\"Conner");
@@ -1940,7 +1940,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("Hi ${bodyOneLine} Again", "Hi HelloGreatWorld
Again");
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testListIndexByNestedFunction() {
List<String> alist = new ArrayList<>();
@@ -1957,7 +1957,7 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression(exp, "99");
}
- @Disabled("Investigation pending - see CAMEL-19681")
+ @Disabled("csimple does not support null-safe OGNL, nested functions, or
complex escaping")
@Test
public void testNestedFunction() {
exchange.getMessage().setBody("Tony");
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
index 7dd2bdaed6dc..79693482bbcf 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithClientAuthIT.java
@@ -18,22 +18,22 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
/**
* Test the ftps component over SSL (explicit) with client authentication
*/
+@EnabledIf(value =
"org.apache.camel.test.infra.ftp.services.embedded.FtpsUtil#hasRequiredAlgorithms")
public class FileToFtpsExplicitSSLWithClientAuthIT extends
FtpsServerExplicitSSLWithClientAuthTestSupport {
protected String getFtpUrl() {
return "ftps://admin@localhost:{{ftp.server.port}}"
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
- +
"&securityProtocol=SSLv3&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ +
"&securityProtocol=TLSv1.2&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersIT.java
index 75a559366416..7549c4145f50 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersIT.java
@@ -36,7 +36,7 @@ public class
FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParameters
tmp.setKeyStore(ksp);
SSLContextParameters sslContextParameters = new SSLContextParameters();
- sslContextParameters.setSecureSocketProtocol("SSLv3");
+ sslContextParameters.setSecureSocketProtocol("TLSv1.2");
sslContextParameters.setTrustManagers(tmp);
context.setSSLContextParameters(sslContextParameters);
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
index 8e09aa70f9e9..64c0b265b24b 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
@@ -34,7 +34,7 @@ public class
FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersIT
tmp.setKeyStore(ksp);
SSLContextParameters sslContextParameters = new SSLContextParameters();
- sslContextParameters.setSecureSocketProtocol("SSLv3");
+ sslContextParameters.setSecureSocketProtocol("TLSv1.2");
sslContextParameters.setTrustManagers(tmp);
return sslContextParameters;
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
index cbe679940b0e..739a7f2e9400 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitSSLWithoutClientAuthIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -31,10 +30,9 @@ public class FileToFtpsExplicitSSLWithoutClientAuthIT
extends FtpsServerExplicit
protected String getFtpUrl() {
return "ftps://admin@localhost:{{ftp.server.port}}"
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true"
- + "&securityProtocol=SSLv3&implicit=false";
+ + "&securityProtocol=TLSv1.2&implicit=false";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
index e075c33f3397..b31be68340fe 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithClientAuthIT.java
@@ -35,7 +35,7 @@ public class FileToFtpsExplicitTLSWithClientAuthIT extends
FtpsServerExplicitTLS
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
+ @Disabled("Embedded Apache FtpServer does not support TLS 1.3")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
index 9122300cd8ec..06e1db5fd593 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsExplicitTLSWithoutClientAuthIT.java
@@ -34,7 +34,7 @@ public class FileToFtpsExplicitTLSWithoutClientAuthIT extends
FtpsServerExplicit
+ "&securityProtocol=TLSv1.3&implicit=false&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
+ @Disabled("Embedded Apache FtpServer does not support TLS 1.3")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersIT.java
index 1fdd8a2b11d8..6cd1e29d269d 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersIT.java
@@ -37,7 +37,7 @@ public class
FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersIT extend
tmp.setKeyStore(ksp);
SSLContextParameters sslContextParameters = new SSLContextParameters();
- sslContextParameters.setSecureSocketProtocol("SSLv3");
+ sslContextParameters.setSecureSocketProtocol("TLSv1.2");
sslContextParameters.setKeyManagers(kmp);
sslContextParameters.setTrustManagers(tmp);
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
index 621105dd6e84..c5b6805fb2c2 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithClientAuthIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -31,11 +30,10 @@ public class FileToFtpsImplicitSSLWithClientAuthIT extends
FtpsServerImplicitSSL
protected String getFtpUrl() {
return "ftps://admin@localhost:{{ftp.server.port}}"
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
- +
"&securityProtocol=SSLv3&implicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ +
"&securityProtocol=TLSv1.2&implicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
index 22412d869cfe..3baf95039de3 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersIT.java
@@ -33,7 +33,7 @@ public class
FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersIT
tmp.setKeyStore(ksp);
SSLContextParameters sslContextParameters = new SSLContextParameters();
- sslContextParameters.setSecureSocketProtocol("SSLv3");
+ sslContextParameters.setSecureSocketProtocol("TLSv1.2");
sslContextParameters.setTrustManagers(tmp);
return sslContextParameters;
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
index d489a7991d9d..52a731442bf5 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitSSLWithoutClientAuthIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -31,10 +30,9 @@ public class FileToFtpsImplicitSSLWithoutClientAuthIT
extends FtpsServerImplicit
protected String getFtpUrl() {
return "ftps://admin@localhost:{{ftp.server.port}}"
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=SSLv3&implicit=true&delete=true";
+ + "&securityProtocol=TLSv1.2&implicit=true&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
index 287f6d415f15..d2668205cfcc 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithClientAuthIT.java
@@ -35,7 +35,7 @@ public class FileToFtpsImplicitTLSWithClientAuthIT extends
FtpsServerImplicitTLS
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
+ @Disabled("Embedded Apache FtpServer does not support TLS 1.3")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
index fd1fca304f82..8294ff1e00ec 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsImplicitTLSWithoutClientAuthIT.java
@@ -34,7 +34,7 @@ public class FileToFtpsImplicitTLSWithoutClientAuthIT extends
FtpsServerImplicit
+ "&securityProtocol=TLSv1.3&implicit=true&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
+ @Disabled("Embedded Apache FtpServer does not support TLS 1.3")
@Test
public void testFromFileToFtp() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
index 3b27e107a18d..d89525f15021 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomKeyAndTrustStorePropertiesIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -31,13 +30,12 @@ public class
FileToFtpsWithCustomKeyAndTrustStorePropertiesIT extends FtpsServer
private String getFtpUrl() {
return "ftps://admin@localhost:{{ftp.server.port}}"
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
- +
"&securityProtocol=SSLv3&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ +
"&securityProtocol=TLSv1.2&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+
"&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password"
+
"&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+
"&ftpClient.trustStore.algorithm=SunX509&ftpClient.trustStore.password=password&delete=true";
}
- @Disabled
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
index d1cba311926a..a987a434dfb5 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithCustomTrustStorePropertiesIT.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.file.remote.integration;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -31,11 +30,10 @@ public class FileToFtpsWithCustomTrustStorePropertiesIT
extends FtpsServerExplic
private String getFtpUrl() {
return "ftps://admin@localhost:{{ftp.server.port}}"
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true"
- +
"&securityProtocol=SSLv3&implicit=false&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+ +
"&securityProtocol=TLSv1.2&implicit=false&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+
"&ftpClient.trustStore.algorithm=SunX509&ftpClient.trustStore.password=password&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
index df3f0e35a688..29edc6b1109b 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithDefaultSettingsIT.java
@@ -33,7 +33,7 @@ public class FileToFtpsWithDefaultSettingsIT extends
FtpsServerExplicitTLSWithou
+
"/tmp2/camel?password=admin&initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
+ @Disabled("Embedded Apache FtpServer does not support TLS 1.3")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
index 7802ced603b1..8f450ee9f064 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FileToFtpsWithFtpClientConfigRefIT.java
@@ -20,7 +20,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.net.ftp.FTPSClient;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
@@ -31,10 +30,10 @@ import org.junit.jupiter.api.condition.EnabledIf;
public class FileToFtpsWithFtpClientConfigRefIT extends
FtpsServerExplicitSSLWithoutClientAuthTestSupport {
@BindToRegistry("ftpsClient")
- private final FTPSClient client = new FTPSClient("SSLv3");
+ private final FTPSClient client = new FTPSClient("TLSv1.2");
@BindToRegistry("ftpsClientIn")
- private final FTPSClient client1 = new FTPSClient("SSLv3");
+ private final FTPSClient client1 = new FTPSClient("TLSv1.2");
private String getFtpUrl(boolean in) {
return
"ftps://admin@localhost:{{ftp.server.port}}/tmp2/camel?password=admin&initialDelay=2000&ftpClient=#ftpsClient"
@@ -42,7 +41,6 @@ public class FileToFtpsWithFtpClientConfigRefIT extends
FtpsServerExplicitSSLWit
+ "&disableSecureDataChannelDefaults=true&delete=true";
}
- @Disabled("CAMEL-16784:Disable testFromFileToFtp tests")
@Test
public void testFromFileToFtp() throws Exception {
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpsServerTestSupport.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpsServerTestSupport.java
index e2086788d633..36956e278d55 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpsServerTestSupport.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/integration/FtpsServerTestSupport.java
@@ -22,6 +22,6 @@ import
org.apache.camel.component.file.remote.BaseServerTestSupport;
* Abstract base class for unit testing using a secure FTP Server (over
SSL/TLS)
*/
public abstract class FtpsServerTestSupport extends BaseServerTestSupport {
- protected static final String AUTH_VALUE_SSL = "SSLv3";
+ protected static final String AUTH_VALUE_SSL = "TLSv1.2";
protected static final String AUTH_VALUE_TLS = "TLSv1.3";
}
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
index 31c031ae59dd..2ea5f04e55bc 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
@@ -31,7 +31,6 @@ import java.util.Locale;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.util.ResourceLeakDetector;
import org.apache.camel.Exchange;
@@ -47,7 +46,6 @@ import org.apache.logging.log4j.core.LogEvent;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -56,9 +54,6 @@ import org.slf4j.LoggerFactory;
import static org.assertj.core.api.Assertions.assertThat;
-@Disabled("TODO:
https://issues.apache.org/jira/projects/CAMEL/issues/CAMEL-16718";)
-// this test was working before due to a netty ref count exception was ignored
(seems we attempt to write 2 times)
-// now this real caused exception is detected by Camel
public class ProxyProtocolTest {
private static final Logger LOG =
LoggerFactory.getLogger(ProxyProtocolTest.class);
@@ -272,12 +267,10 @@ public class ProxyProtocolTest {
private static void uppercase(final Exchange exchange) {
final Message message = exchange.getMessage();
- final ByteBuf body = message.getBody(ByteBuf.class);
+ final String body = message.getBody(String.class);
- if (body.capacity() != 0) {
- // only if we received a payload we'll uppercase it
-
message.setBody(body.toString(StandardCharsets.US_ASCII).toUpperCase(Locale.US));
+ if (ObjectHelper.isNotEmpty(body)) {
+ message.setBody(body.toUpperCase(Locale.US));
}
- body.release();
}
}
diff --git
a/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java
b/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java
index b08d317fb3fb..37dd4cc9d83d 100644
---
a/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java
+++
b/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java
@@ -205,7 +205,7 @@ public class Olingo4AppAPITest {
}
@Test
- @Disabled("CAMEL-22271 - failing since jackson upgrade from 2.19.1 to
2.19.2")
+ @Disabled("CAMEL-22271 - olingo4 is deprecated (Apache Attic), upstream
bug OLINGO-1641 will not be fixed")
public void testReadUnparsedEntitySet() throws Exception {
final TestOlingo4ResponseHandler<InputStream> responseHandler = new
TestOlingo4ResponseHandler<>();
@@ -244,7 +244,7 @@ public class Olingo4AppAPITest {
}
@Test
- @Disabled("CAMEL-22271 - failing since jackson upgrade from 2.19.1 to
2.19.2")
+ @Disabled("CAMEL-22271 - olingo4 is deprecated (Apache Attic), upstream
bug OLINGO-1641 will not be fixed")
public void testReadUnparsedEntity() throws Exception {
final TestOlingo4ResponseHandler<InputStream> responseHandler = new
TestOlingo4ResponseHandler<>();
diff --git
a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/account/AccountProducerTest.java
b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/account/AccountProducerTest.java
index 42dece206a4f..a2739e6b3dfc 100644
---
a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/account/AccountProducerTest.java
+++
b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/account/AccountProducerTest.java
@@ -31,7 +31,7 @@ import org.knowm.xchange.dto.account.Wallet;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-@Disabled("See CAMEL-19751 before enabling")
+@Disabled("CAMEL-19751 - tests hit live Binance API during exchange init,
WireMock does not cover futures endpoint")
public class AccountProducerTest extends XChangeTestSupport {
@Override
diff --git
a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/market/MarketDataProducerTest.java
b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/market/MarketDataProducerTest.java
index 8696a969b6b5..6dfe70d1eacc 100644
---
a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/market/MarketDataProducerTest.java
+++
b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/market/MarketDataProducerTest.java
@@ -26,7 +26,7 @@ import org.knowm.xchange.dto.marketdata.Ticker;
import static
org.apache.camel.component.xchange.XChangeConfiguration.HEADER_CURRENCY_PAIR;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-@Disabled("See CAMEL-19751 before enabling")
+@Disabled("CAMEL-19751 - tests hit live Binance API during exchange init,
WireMock does not cover futures endpoint")
public class MarketDataProducerTest extends XChangeTestSupport {
@Override
diff --git
a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/metadata/MetaDataProducerTest.java
b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/metadata/MetaDataProducerTest.java
index 305ea4beb0fe..81a79d248697 100644
---
a/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/metadata/MetaDataProducerTest.java
+++
b/components/camel-xchange/src/test/java/org/apache/camel/component/xchange/metadata/MetaDataProducerTest.java
@@ -32,7 +32,7 @@ import static
org.apache.camel.component.xchange.XChangeConfiguration.HEADER_CUR
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@Disabled("See CAMEL-19751 before enabling")
+@Disabled("CAMEL-19751 - tests hit live Binance API during exchange init,
WireMock does not cover futures endpoint")
public class MetaDataProducerTest extends XChangeTestSupport {
@Override
