1 files changed, 23 insertions, 12 deletions

diff --git a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
index 550f089..0d5fe9d 100644
--- a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
+++ b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
@@ -1,13 +1,13 @@
 package at.gv.egiz.moazs;
 
 
-import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
 import at.gv.egiz.moazs.client.TnvzHelper;
+import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
 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.msg.xsd.ObjectFactory;
 import at.gv.zustellung.tnvz.xsd.MimeTypeList;
+import at.gv.zustellung.tnvz.xsd.MimeTypeListType;
 import at.gv.zustellung.tnvz.xsd.QueryPersonResponse;
 import at.gv.zustellung.tnvz.xsd.TNVZServicePort;
 import org.junit.Before;
@@ -29,6 +29,7 @@ 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.MimeTypeListType.mimeTypeListTypeBuilder;
 import static at.gv.zustellung.tnvz.xsd.PersonResultSuccessType.personResultSuccessTypeBuilder;
 import static at.gv.zustellung.tnvz.xsd.PersonResultType.Error.errorBuilder;
 import static at.gv.zustellung.tnvz.xsd.PersonResultType.personResultTypeBuilder;
@@ -42,6 +43,8 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class TnvzHelperTest {
 
+    private static final ObjectFactory FACTORY = new ObjectFactory();
+
     private TnvzHelper helper;
 
     @Mock
@@ -57,11 +60,11 @@ public class TnvzHelperTest {
 
     @Test
     public void acceptWildcardMimetype() {
-        List<String> acceptedTypes = List.of("*/*");
+        List<String> acceptedTypes = List.of();
         List<String> attachedTypes = List.of("pdf", "xml", "html", "random/attachedtype");
         var receiverId = identification("zbpk", "receiver-id-value");
         var deliveryRequest = deliveryRequest(attachedTypes, receiverId);
-        var success = tnvzSuccess(acceptedTypes, receiverId);
+        var success = tnvzSuccess(acceptedTypes, true, receiverId);
         when(port.queryPerson(any())).thenReturn(success);
 
         var actual = helper.performQueryPersonRequest(deliveryRequest, port);
@@ -86,7 +89,7 @@ public class TnvzHelperTest {
         List<String> attachedTypes = List.of("pdf", "xml", "html", "random/attachedtype");
         var receiverId = identification("zbpk", "receiver-id-value");
         var deliveryRequest = deliveryRequest(attachedTypes, receiverId);
-        var success = tnvzSuccess(acceptedTypes, receiverId);
+        var success = tnvzSuccess(acceptedTypes, false, receiverId);
         when(port.queryPerson(any())).thenReturn(success);
 
         helper.performQueryPersonRequest(deliveryRequest, port);
@@ -98,7 +101,7 @@ public class TnvzHelperTest {
         List<String> attachedTypes = List.of("pdf", "xml");
         var receiverId = identification("zbpk", "receiver-id-value");
         var deliveryRequest = deliveryRequest(attachedTypes, receiverId);
-        var success = tnvzSuccess(acceptedTypes, receiverId);
+        var success = tnvzSuccess(acceptedTypes, false, receiverId);
         when(port.queryPerson(any())).thenReturn(success);
 
         var actual = helper.performQueryPersonRequest(deliveryRequest, port);
@@ -156,23 +159,31 @@ public class TnvzHelperTest {
                 .collect(toList());
     }
 
-    public QueryPersonResponse tnvzSuccess(List<String> mimeTypes, IdentificationType receiverId) {
+    public QueryPersonResponse tnvzSuccess(List<String> mimeTypes, boolean allMimetypesAccepted, IdentificationType receiverId) {
 
-        var success = personResultSuccessTypeBuilder()
+        var successBuilder = personResultSuccessTypeBuilder()
                 .withMimeTypeList(setupMimeTypeList(mimeTypes))
-                .withIdentification(converter.convert(receiverId))
-                .build();
+                .withIdentification(converter.convert(receiverId));
+
+        if(allMimetypesAccepted) {
+            successBuilder.withAllStandardMimeTypes(FACTORY.createIndicatorType());
+        }
 
         var personResult = personResultTypeBuilder()
-                .withSuccess(success)
+                .withSuccess(successBuilder.build())
                 .build();
 
         var queryResultList = queryResultListBuilder()
                 .withQueryResult(List.of(personResult))
                 .build();
 
+        MimeTypeListType standardList = mimeTypeListTypeBuilder()
+                .withMimeType(List.of())
+                .build();
+
         return queryPersonResponseBuilder()
                 .withQueryResultList(queryResultList)
+                .withStandardMimeTypeList(standardList)
                 .build();
     }