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 6c663d941e01c..3d2ee17879686 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 void testOGNLBodyListAndMap() { 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> map = new HashMap<>(); @@ -1325,7 +1325,7 @@ public void testBodyOGNLOrderListOutOfBoundsShorthand() { 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 lines = new ArrayList<>(); @@ -1338,7 +1338,7 @@ public void testBodyOGNLOrderListOutOfBoundsWithNullSafe() { 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 lines = new ArrayList<>(); @@ -1351,7 +1351,7 @@ public void testBodyOGNLOrderListOutOfBoundsWithNullSafeShorthand() { 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 lines = new ArrayList<>(); @@ -1367,7 +1367,7 @@ public void testBodyOGNLOrderListNoMethodNameWithNullSafe() { 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 lines = new ArrayList<>(); @@ -1383,7 +1383,7 @@ public void testBodyOGNLOrderListNoMethodNameWithNullSafeShorthand() { 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 void testBodyOGNLNullSafeToAvoidNPE() { 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 void testBodyOgnlReplaceEscapedChar() { 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 void testBodyOgnlReplaceFirst() { 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 void testBodyAsOneLine() { 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 alist = new ArrayList<>(); @@ -1957,7 +1957,7 @@ public void testListIndexByNestedFunction() { 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 7dd2bdaed6dc9..79693482bbcf9 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 @@ 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 75a5593664169..7549c4145f50d 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 @@ protected CamelContext createCamelContext() throws Exception { 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 8e09aa70f9e99..64c0b265b24b5 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 SSLContextParameters createSslContextParams() { 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 cbe679940b0e8..739a7f2e9400f 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 @@ 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 e075c33f3397a..b31be68340fe5 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 @@ protected String getFtpUrl() { + "&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 9122300cd8ec2..06e1db5fd5932 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 @@ protected String getFtpUrl() { + "&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 1fdd8a2b11d82..6cd1e29d269d2 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 SSLContextParameters createSslContextParams() { 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 621105dd6e849..c5b6805fb2c29 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 @@ 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 22412d869cfef..3baf95039de3c 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 SSLContextParameters createSslContextParams() { 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 d489a7991d9df..52a731442bf53 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 @@ 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 287f6d415f15f..d2668205cfcc5 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 @@ protected String getFtpUrl() { + "&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 fd1fca304f821..8294ff1e00ec2 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 @@ protected String getFtpUrl() { + "&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 3b27e107a18dd..d89525f15021e 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 @@ 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 d1cba311926aa..a987a434dfb58 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 @@ 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 df3f0e35a6881..29edc6b1109b9 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 @@ private String getFtpUrl() { + "/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 7802ced603b13..8f450ee9f064d 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.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 @@ 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 @@ private String getFtpUrl(boolean in) { + "&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 e2086788d6339..36956e278d554 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 @@ * 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 31c031ae59dd3..2ea5f04e55bc0 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.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.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 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 @@ private static InputStream request(final String url, final String payload, final 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 b08d317fb3fbd..37dd4cc9d83dd 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 void testReadEntitySet() throws Exception { } @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 responseHandler = new TestOlingo4ResponseHandler<>(); @@ -244,7 +244,7 @@ public void testReadEntity() throws Exception { } @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 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 42dece206a4f9..a2739e6b3dfc9 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 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 8696a969b6b58..6dfe70d1eacc0 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 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 305ea4beb0feb..81a79d2486972 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.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