diff options
author | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-10-02 14:30:43 +0200 |
---|---|---|
committer | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-10-02 14:30:43 +0200 |
commit | b3060f8ba40280d438e2b4b06b39aed84c587f7a (patch) | |
tree | 8f28026793af1a6d3b071ae91d1afe972b1d8fa7 /src/test | |
parent | dedb4687f46c0ea10539edc38206d440fe0c806e (diff) | |
download | moa-zs-b3060f8ba40280d438e2b4b06b39aed84c587f7a.tar.gz moa-zs-b3060f8ba40280d438e2b4b06b39aed84c587f7a.tar.bz2 moa-zs-b3060f8ba40280d438e2b4b06b39aed84c587f7a.zip |
For {TNVZ, MSG}: Switch to Soap 1.2
- But: Leave MZS Interface at Soap 1.1
- Add ClientFactory.createSOAP11 to ensure that we can talk back to the app.
Diffstat (limited to 'src/test')
6 files changed, 12 insertions, 12 deletions
diff --git a/src/test/java/at/gv/egiz/moazs/ITEndToEndTest.java b/src/test/java/at/gv/egiz/moazs/ITEndToEndTest.java index 29b7b53..95c7140 100644 --- a/src/test/java/at/gv/egiz/moazs/ITEndToEndTest.java +++ b/src/test/java/at/gv/egiz/moazs/ITEndToEndTest.java @@ -92,7 +92,7 @@ public class ITEndToEndTest { APP = mockApp(); when(factory.create(any(), same(TNVZServicePort.class))).thenReturn(tnvz); when(factory.create(any(), same(App2ZusePort.class))).thenReturn(msg); - when(factory.create(any(), same(Mzs2AppPortType.class))).thenReturn(APP); + when(factory.createSoap11(any(), same(Mzs2AppPortType.class))).thenReturn(APP); return factory; } diff --git a/src/test/java/at/gv/egiz/moazs/SOAPUtilsTest.java b/src/test/java/at/gv/egiz/moazs/SOAPUtilsTest.java index ff0060e..bf74ac0 100644 --- a/src/test/java/at/gv/egiz/moazs/SOAPUtilsTest.java +++ b/src/test/java/at/gv/egiz/moazs/SOAPUtilsTest.java @@ -15,7 +15,7 @@ public class SOAPUtilsTest { SOAPUtils utils; private static final String SOAP_MESSAGE = - "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body>" + + "<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\"><soap:Body>" + "<DeliveryResponse xmlns=\"http://reference.e-government.gv.at/namespace/zustellung/msg/phas" + "e2/20181206#\" xmlns:ns2=\"http://reference.e-government.gv.at/namespace/persondata/phase2/" + "20181206#\" xmlns:ns3=\"http://www.w3.org/2000/09/xmldsig#\"><PartialSuccess><DeliverySyste" + @@ -26,7 +26,7 @@ public class SOAPUtilsTest { public static final String FORMATTED_MESSAGE = "<soapenv:Envelope\n" + - " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" + + " xmlns:soapenv=\"http://www.w3.org/2003/05/soap-envelope\"\n" + " xmlns:msg=\"http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#\">\n" + " <soapenv:Body>\n" + " <msg:DeliveryNotification>\n" + @@ -38,7 +38,7 @@ public class SOAPUtilsTest { public static final String CLUTTERED_MESSAGE = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + "<soapenv:Envelope " + - " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n " + + " xmlns:soapenv=\"http://www.w3.org/2003/05/soap-envelope\"\n " + " xmlns:msg=\"http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#\">\n" + " <soapenv:Body unexpected-attribute=\"unexpectedvalue\"> \n" + " <msg:DeliveryNotification>\n" + @@ -48,14 +48,14 @@ public class SOAPUtilsTest { "</soapenv:Envelope>\n"; private static final String MISSING_BODY_MESSAGE = - "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><NotABodyTag></NotABodyTag></soap:Envelope>"; + "<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\"><NotABodyTag></NotABodyTag></soap:Envelope>"; private static final String EMPTY_BODY_MESSAGE = - "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"><soap:Body> </soap:Body></soap:Envelope>"; + "<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\"><soap:Body> </soap:Body></soap:Envelope>"; public static final String EMPTY_APP_DELIVERY_ID_MESSAGE = "<soapenv:Envelope\n" + - " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" + + " xmlns:soapenv=\"http://www.w3.org/2003/05/soap-envelope\"\n" + " xmlns:msg=\"http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#\">\n" + " <soapenv:Body>\n" + " <msg:DeliveryNotification>\n" + @@ -66,7 +66,7 @@ public class SOAPUtilsTest { public static final String BLANK_APP_DELIVERY_ID_MESSAGE = "<soapenv:Envelope\n" + - " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" + + " xmlns:soapenv=\"http://www.w3.org/2003/05/soap-envelope\"\n" + " xmlns:msg=\"http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#\">\n" + " <soapenv:Body>\n" + " <msg:DeliveryNotification>\n" + diff --git a/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-notification.xml b/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-notification.xml index 3a90d36..2f99af5 100644 --- a/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-notification.xml +++ b/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-notification.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <soapenv:Envelope - xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/phase2/20181206#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-request-status.xml b/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-request-status.xml index bbeded8..f81a554 100644 --- a/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-request-status.xml +++ b/src/test/resources/at/gv/egiz/moazs/ITEndToEndTest/msg-delivery-request-status.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <soapenv:Envelope - xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" + xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:msg="http://reference.e-government.gv.at/namespace/zustellung/msg/phase2/20181206#"> <soapenv:Body> diff --git a/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-shuffled-soaped-notification.xml b/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-shuffled-soaped-notification.xml index 1262c3e..f40a6f0 100644 --- a/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-shuffled-soaped-notification.xml +++ b/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-shuffled-soaped-notification.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"> +<soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope"> <soapenv:Body><DeliveryNotification xmlns="http://reference.e-government.gv.at/namespace/zustellung/msg" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"> <Success> <DeliveryService>https://localhost/example-delivery-system</DeliveryService> diff --git a/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-soaped-notification.xml b/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-soaped-notification.xml index 54e9918..535b2ad 100644 --- a/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-soaped-notification.xml +++ b/src/test/resources/at/gv/egiz/moazs/ITSignatureVerifierTest/valid-signed-soaped-notification.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"> +<soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope"> <soapenv:Body><DeliveryNotification xmlns="http://reference.e-government.gv.at/namespace/zustellung/msg" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:p="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"> <Success> <DeliveryService>https://localhost/example-delivery-system</DeliveryService> |