1 files changed, 12 insertions, 4 deletions
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))