1 files changed, 23 insertions, 6 deletions
diff --git a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
index c389b61..4bd64ef 100644
--- a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
+++ b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
@@ -4,19 +4,36 @@ import at.gv.egiz.moazs.preprocess.ConfigUtil;
 import at.gv.egiz.moazs.preprocess.DeliveryRequestAugmenter;
 import at.gv.zustellung.app2mzs.xsd.ConfigType;
 import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Map;
 
+import static at.gv.zustellung.app2mzs.xsd.ClientType.clientTypeBuilder;
 import static at.gv.zustellung.app2mzs.xsd.ConfigType.configTypeBuilder;
 import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.deliveryRequestTypeBuilder;
-import static at.gv.zustellung.app2mzs.xsd.ServerType.serverTypeBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 
+@RunWith(MockitoJUnitRunner.class)
 public class DeliveryRequestAugmenterTest {
 
     private final String msgUrl = "http://mzs";
 
+    @Mock
+    private ConfigUtil configUtil;
+
+    @Before
+    public void setupMock() {
+        when(configUtil.isComplete(Mockito.any())).thenReturn(true);
+        when(configUtil.merge(any(), any())).thenCallRealMethod();
+    }
+
     @Test
     public void augmentPrimaryWithoutConfig() {
         var fallback = createConfig(msgUrl, false);
@@ -88,11 +105,11 @@ public class DeliveryRequestAugmenterTest {
     }
 
     private DeliveryRequestAugmenter createAugmenter(ConfigType fallback) {
-        return new DeliveryRequestAugmenter(Map.of("default", fallback), new ConfigUtil());
+        return new DeliveryRequestAugmenter(Map.of("default", fallback), configUtil);
     }
 
     private DeliveryRequestAugmenter createAugmenter(Map<String, ConfigType> profiles) {
-        return new DeliveryRequestAugmenter(profiles, new ConfigUtil());
+        return new DeliveryRequestAugmenter(profiles, configUtil);
     }
 
     private ConfigType createConfig(String url, Boolean performTnvz) {
@@ -101,12 +118,12 @@ public class DeliveryRequestAugmenterTest {
 
     private ConfigType createConfig(String url, Boolean performTnvz, String profileId) {
 
-        var server = serverTypeBuilder()
-                .withZUSEUrlID(url)
+        var msgClient = clientTypeBuilder()
+                .withURL(url)
                 .build();
 
         return configTypeBuilder()
-                .withServer(server)
+                .withMSGClient(msgClient)
                 .withPerformQueryPersonRequest(performTnvz)
                 .withProfileID(profileId)
                 .build();