1 files changed, 29 insertions, 17 deletions

diff --git a/src/test/java/at/gv/egiz/moazs/ITMzsServiceTest.java b/src/test/java/at/gv/egiz/moazs/ITMzsServiceTest.java
index e9b4f70..3cf0362 100644
--- a/src/test/java/at/gv/egiz/moazs/ITMzsServiceTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ITMzsServiceTest.java
@@ -2,12 +2,14 @@ package at.gv.egiz.moazs;
 
 import at.gv.egiz.moazs.repository.DeliveryRepository;
 import at.gv.egiz.moazs.scheme.RequestStatusResponse;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -27,17 +29,24 @@ import java.util.function.Consumer;
 import static at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.Success.successBuilder;
 import static at.gv.zustellung.msg.xsd.DeliveryRequestStatusType.deliveryRequestStatusTypeBuilder;
 import static java.net.http.HttpClient.Version;
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 
 public class ITMzsServiceTest {
 
-    private final String serviceUri = "http://localhost:8080/services/DeliveryRequest";
-
     private final String basePath = "src/test/resources/at/gv/egiz/moazs/ITMzsServiceTest/";
 
+    @LocalServerPort
+    public int port;
+    private String serviceUri;
+
+    @Before
+    public void setupServiceURI() {
+        this.serviceUri = "http://localhost:" + port + "/services/mzs";
+    }
+
     @TestConfiguration
     public static class TestConfig {
 
@@ -64,50 +73,44 @@ public class ITMzsServiceTest {
             };
         }
 
-        private XMLGregorianCalendar genTimeStamp() {
-            try {
-                return DatatypeFactory.newInstance().newXMLGregorianCalendar(new GregorianCalendar());
-            } catch (DatatypeConfigurationException e) {
-                throw new RuntimeException("ups");
-            }
 
-        }
     }
 
     @Test
     public void acceptValidDeliveryRequest() throws IOException, InterruptedException {
         var response = sendDeliveryRequestFile("validDeliveryRequest.soap");
-        assertEquals(200, response.statusCode());
+        assertThat(response.statusCode()).isEqualTo(200);
+        assertThat(response.body()).contains("valid-delivery-request-id");
     }
 
     @Test
     public void rejectRequestWithoutSender() throws IOException, InterruptedException {
         var response = sendDeliveryRequestFile("missingSender.soap");
-        assertEquals(500, response.statusCode());
+        assertThat(response.statusCode()).isEqualTo(500);
     }
 
     @Test
     public void rejectBothProfileAndCorporateBody() throws IOException, InterruptedException {
         var response = sendDeliveryRequestFile("profileAndCorporateBody.soap");
-        assertEquals(500, response.statusCode());
+        assertThat(response.statusCode()).isEqualTo(500);
     }
 
     @Test
     public void rejectFormallyIncorrectDeliveryRequest() throws IOException, InterruptedException {
         var response = sendDeliveryRequestFile("formallyIncorrectDeliveryRequest.soap");
-        assertEquals(500, response.statusCode());
+        assertThat(response.statusCode()).isEqualTo(500);
     }
 
     @Test
     public void rejectRequestWithoutAppDeliveryID() throws IOException, InterruptedException {
         var response = sendDeliveryRequestFile("missingAppDeliveryId.soap");
-        assertEquals(500, response.statusCode());
+        assertThat(response.statusCode()).isEqualTo(500);
     }
 
     @Test
     public void rejectRequestWithoutMetaData() throws IOException, InterruptedException {
         var response = sendDeliveryRequestFile("missingMetaData.soap");
-        assertEquals(500, response.statusCode());
+        assertThat(response.statusCode()).isEqualTo(500);
     }
 
     private HttpResponse<String> sendDeliveryRequestFile(String fileName) throws IOException, InterruptedException {
@@ -125,4 +128,13 @@ public class ITMzsServiceTest {
 
     }
 
+    public static XMLGregorianCalendar genTimeStamp() {
+        try {
+            return DatatypeFactory.newInstance().newXMLGregorianCalendar(new GregorianCalendar());
+        } catch (DatatypeConfigurationException e) {
+            throw new RuntimeException("ups");
+        }
+
+    }
+
 }