From cb9a76eaafd37f921006822bcfe043655288bc63 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Mon, 22 Jul 2019 13:02:19 +0200
Subject: Test Flow of DeliveryRequest from "End-To-End" & Fix Bugs

Schema Changes:
- Remove mzs:DeliveryRequest/TnvzMetaData because all metadata fields
  can be collected from DeliveryRequest and redundancy is not needed.

Fixes and Refactoring in preprocess:
- MzsDeliveryRequestValidator: Instead of returning false, throw an
  exception when a condition is not met, and explain which condition
  is not met / why it is not met in the exception's message.
- Integrate interface change in ConfigProfileGenerator and
  DeliveryRequestAugmenter.
- Rewrite and simplify DeliveryRequestAugmenter's augmentation.
- ConfigUtil Fixes: Ensure that we do not override the wrong
  parameters while merging. This error appeared in tnvz / msg client,
  connection / receive timeout, key / trust store, and lax hostname
  verification / trust all.

Fix Bugs in Interceptor / SoapUtils:
- Problem: DOM access and information extraction was implemented
  somewhat sloppy.
- SolutioN: Change DOM access interface to access DOM more
  efficiently. Add boundary checks and handle edge cases while
  extracting information from SOAP Messages.
- Test those changes properly.

Testing:
- Implement Delivery Request Flow in ITEndToEndTest.
- Start application on random port instead of fixed port when running
  integration tests.
- Add assertions to tests in ITMzsServiceTest suite.

Others Bug Fixes:
- ServicesConfig: Ensure that mzs service and msg service run on
  different endpoint addresses (/msg and /mzs).
- DeliveryRequestBackend: Throw exception when binary message is
  missing. Don't wrap the exception.
- SaveResponseToFileSink: Wrap Response in JAXB Element (otherwise,
  marshaller does not recognize it)
---
 src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java')

diff --git a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
index 020e270..550f089 100644
--- a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
+++ b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
@@ -5,6 +5,8 @@ import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
 import at.gv.egiz.moazs.client.TnvzHelper;
 import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
 import at.gv.zustellung.app2mzs.xsd.persondata.IdentificationType;
+import at.gv.zustellung.msg.xsd.MetaData;
+import at.gv.zustellung.msg.xsd.SystemComponentType;
 import at.gv.zustellung.tnvz.xsd.MimeTypeList;
 import at.gv.zustellung.tnvz.xsd.QueryPersonResponse;
 import at.gv.zustellung.tnvz.xsd.TNVZServicePort;
@@ -20,11 +22,12 @@ import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.Payload.payloadBu
 import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.Receiver.receiverBuilder;
 import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.Sender.senderBuilder;
 import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.deliveryRequestTypeBuilder;
-import static at.gv.zustellung.app2mzs.xsd.TnvzMetaDataType.tnvzMetaDataTypeBuilder;
 import static at.gv.zustellung.app2mzs.xsd.persondata.CorporateBodyType.corporateBodyTypeBuilder;
 import static at.gv.zustellung.app2mzs.xsd.persondata.IdentificationType.Value.valueBuilder;
 import static at.gv.zustellung.app2mzs.xsd.persondata.IdentificationType.identificationTypeBuilder;
 import static at.gv.zustellung.msg.xsd.ErrorInfoType.errorInfoTypeBuilder;
+import static at.gv.zustellung.msg.xsd.MetaData.metaDataBuilder;
+import static at.gv.zustellung.msg.xsd.SystemComponentType.systemComponentTypeBuilder;
 import static at.gv.zustellung.tnvz.xsd.MimeTypeList.mimeTypeListBuilder;
 import static at.gv.zustellung.tnvz.xsd.PersonResultSuccessType.personResultSuccessTypeBuilder;
 import static at.gv.zustellung.tnvz.xsd.PersonResultType.Error.errorBuilder;
@@ -119,14 +122,19 @@ public class TnvzHelperTest {
                 .withIdentification(receiverId)
                 .build();
 
-        var metadata = tnvzMetaDataTypeBuilder()
+        var origin = systemComponentTypeBuilder()
+                .withParticipantID("ID")
+                .build();
+
+        var metadata = metaDataBuilder()
+                .withOrigin(origin)
                 .build();
 
         return deliveryRequestTypeBuilder()
                 .withSender(sender)
                 .withReceiver(receiver)
-                .withTnvzMetaData(metadata)
                 .withPayload(payload(mzsMimeTypes))
+                .withMetaData(metadata)
                 .build();
     }
 
@@ -148,7 +156,7 @@ public class TnvzHelperTest {
                 .collect(toList());
     }
 
-    private QueryPersonResponse tnvzSuccess(List<String> mimeTypes, IdentificationType receiverId) {
+    public QueryPersonResponse tnvzSuccess(List<String> mimeTypes, IdentificationType receiverId) {
 
         var success = personResultSuccessTypeBuilder()
                 .withMimeTypeList(setupMimeTypeList(mimeTypes))
-- 
cgit v1.2.3