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
commit cbc18689784c704599fca91b117ad3193fe8fffa Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jun 14 16:23:14 2021 +0200 Fixed test whether running on java 8 or 11 where xml output can have newline or not --- .../apache/camel/component/xmlsecurity/ECDSASignatureTest.java | 10 +++++++++- .../camel/component/xmlsecurity/SignatureAlgorithmTest.java | 10 +++++++++- .../camel/component/xmlsecurity/SignatureDigestMethodTest.java | 10 +++++++++- .../apache/camel/component/xmlsecurity/XmlSignatureTest.java | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java index a0dd936..a90bca8 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java @@ -241,8 +241,16 @@ public class ECDSASignatureTest extends CamelTestSupport { } private MockEndpoint setupMock(String payload) { + String payload2; + int pos = payload.indexOf('\n'); + if (pos != -1) { + payload2 = payload.substring(0, pos) + payload.substring(pos + 1); + } else { + payload2 = payload.replaceFirst("\\?>", "\\?>\n"); + } MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived(payload); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).in(payload, payload2); return mock; } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java index 83c9e39..96a29e7 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java @@ -430,8 +430,16 @@ public class SignatureAlgorithmTest extends CamelTestSupport { } private MockEndpoint setupMock(String payload) { + String payload2; + int pos = payload.indexOf('\n'); + if (pos != -1) { + payload2 = payload.substring(0, pos) + payload.substring(pos + 1); + } else { + payload2 = payload.replaceFirst("\\?>", "\\?>\n"); + } MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived(payload); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).in(payload, payload2); return mock; } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java index 94e11dc..ac38c05 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java @@ -321,8 +321,16 @@ public class SignatureDigestMethodTest extends CamelTestSupport { } private MockEndpoint setupMock(String payload) { + String payload2; + int pos = payload.indexOf('\n'); + if (pos != -1) { + payload2 = payload.substring(0, pos) + payload.substring(pos + 1); + } else { + payload2 = payload.replaceFirst("\\?>", "\\?>\n"); + } MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived(payload); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).in(payload, payload2); return mock; } diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java index 4da6947..5ab1348 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java @@ -1408,8 +1408,16 @@ public class XmlSignatureTest extends CamelTestSupport { } private MockEndpoint setupMock(String payload) { + String payload2; + int pos = payload.indexOf('\n'); + if (pos != -1) { + payload2 = payload.substring(0, pos) + payload.substring(pos + 1); + } else { + payload2 = payload.replaceFirst("\\?>", "\\?>\n"); + } MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedBodiesReceived(payload); + mock.expectedMessageCount(1); + mock.message(0).body(String.class).in(payload, payload2); return mock; }
