You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2023/10/20 15:05:56 UTC
[camel-spring-boot] branch camel-spring-boot-3.21.x updated (7e8b1dc27a2 -> ea1db167ee6)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch camel-spring-boot-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
from 7e8b1dc27a2 Upgrade to spring-boot 2.7.17 (#977)
new b6a9c014a49 fix broken camel-cxf test
new ea1db167ee6 fix another camel-cxf broken test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java | 4 ++--
.../component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java | 4 ++--
.../apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java | 4 ++--
.../org/apache/camel/component/cxf/soap/springboot/ssl/SslTest.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
[camel-spring-boot] 01/02: fix broken camel-cxf test
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch camel-spring-boot-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit b6a9c014a49d742851a0e51915b6ba84a8e7de0e
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Oct 20 10:54:06 2023 -0400
fix broken camel-cxf test
(cherry picked from commit 5f62899a4f4e947cc5adb81ed56dcbc2851a0c5d)
---
.../apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java | 4 ++--
.../component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java | 4 ++--
.../apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java
index 6e6b0bd4183..4a3fedf5488 100644
--- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java
+++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfBeanScopeTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.soap.springboot;
-import java.net.SocketTimeoutException;
+import java.net.http.HttpTimeoutException;
import java.util.ArrayList;
import java.util.List;
@@ -131,7 +131,7 @@ public class CxfBeanScopeTest {
Exchange reply = sendJaxWsMessage(endpointUri);
Exception e = reply.getException();
assertNotNull(e, "We should get the exception cause here");
- assertTrue(e instanceof SocketTimeoutException, "We should get the socket time out exception here");
+ assertTrue(e instanceof HttpTimeoutException, "We should get the time out exception here");
}
@Autowired
diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java
index 27dded0c7ae..3cbc16ff563 100644
--- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java
+++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfMessageHeaderTimeoutTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.soap.springboot;
-import java.net.SocketTimeoutException;
+import java.net.http.HttpTimeoutException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -108,7 +108,7 @@ public class CxfMessageHeaderTimeoutTest {
Exchange reply = sendJaxWsMessage(endpointUri);
Exception e = reply.getException();
assertNotNull(e, "We should get the exception cause here");
- assertTrue(e instanceof SocketTimeoutException, "We should get the socket time out exception here");
+ assertTrue(e instanceof HttpTimeoutException, "We should get the time out exception here");
}
protected Exchange sendJaxWsMessage(String endpointUri) throws InterruptedException {
diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java
index 80663f9ac65..9d8641cc266 100644
--- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java
+++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/CxfTimeoutTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.cxf.soap.springboot;
-import java.net.SocketTimeoutException;
+import java.net.http.HttpTimeoutException;
import java.util.ArrayList;
import java.util.List;
@@ -124,7 +124,7 @@ public class CxfTimeoutTest {
Exchange reply = sendJaxWsMessage(endpointUri);
Exception e = reply.getException();
assertNotNull(e, "We should get the exception cause here");
- assertTrue(e instanceof SocketTimeoutException, "We should get the socket time out exception here");
+ assertTrue(e instanceof HttpTimeoutException, "We should get the time out exception here");
}
@Autowired
[camel-spring-boot] 02/02: fix another camel-cxf broken test
Posted by ff...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch camel-spring-boot-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit ea1db167ee6942b6df4ea3f0a22131ede58d8075
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Fri Oct 20 11:05:47 2023 -0400
fix another camel-cxf broken test
---
.../org/apache/camel/component/cxf/soap/springboot/ssl/SslTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/ssl/SslTest.java b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/ssl/SslTest.java
index c7d894d606f..97f422d4ea3 100644
--- a/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/ssl/SslTest.java
+++ b/components-starter/camel-cxf-soap-starter/src/test/java/org/apache/camel/component/cxf/soap/springboot/ssl/SslTest.java
@@ -97,7 +97,7 @@ public class SslTest {
public void testInvokingNoTrustRoute() throws Exception {
Exchange reply = sendJaxWsMessage("direct:noTrust");
assertTrue(reply.isFailed(), "We expect the exception here");
- Throwable e = reply.getException().getCause();
+ Throwable e = reply.getException();
assertEquals("javax.net.ssl.SSLHandshakeException", e.getClass().getCanonicalName());
}