From 2b6e1ed4f45645797b2874a7cb3be6070265be43 Mon Sep 17 00:00:00 2001 From: Christof Rabensteiner Date: Tue, 30 Apr 2019 13:44:44 +0200 Subject: Generate SoapFault instead of DRStatus/Error Message - App2MZS Server: Instead of generating a DeliveryRequestStatus/Error Message, we throw an exception. This will generate a SoapFault (including a 500 http status code), which is more appropriate. - Fix possible NPE of deliveryRequest.getMetadata().getAppDeliveryID() by moving appDeliveryID initialization into the TimeOutException catch block - pom.xml: Remove hamcrest dependency, as not needed for now. --- src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/test') diff --git a/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java b/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java index 03992ae..bdf00d5 100644 --- a/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java +++ b/src/test/java/at/gv/egiz/moazs/App2MzsServiceTest.java @@ -25,11 +25,8 @@ import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.nio.file.Paths; -import java.util.Arrays; import static java.net.http.HttpClient.Version; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder; import static org.junit.Assert.assertEquals; @RunWith(SpringRunner.class) @@ -82,8 +79,7 @@ public class App2MzsServiceTest { @Test public void rejectRequestWithoutAppDeliveryID() throws IOException, InterruptedException { var response = sendDeliveryRequestFile("missingAppDeliveryId.soap"); - assertEquals(200, response.statusCode()); - assertThat(response.body(), stringContainsInOrder(Arrays.asList("Code>", "500", "/", "Code>"))); + assertEquals(500, response.statusCode()); } @Test -- cgit v1.2.3