From f72e510fea86f71a851501f962ac489130577a5c Mon Sep 17 00:00:00 2001
From: Dominik Adam Przybysz <alien11689@gmail.com>
Date: Sat, 13 Dec 2014 17:49:47 +0100
Subject: [PATCH] Change error response to the same as request text

---
 .../mockserver/server/ContextExecutor.groovy  |  2 +-
 .../pl/touk/mockserver/client/Util.groovy     |  4 ++++
 .../server/MockServerIntegrationTest.groovy   | 20 +++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy b/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
index 923125d..61ea501 100644
--- a/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
+++ b/src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
@@ -40,7 +40,7 @@ class ContextExecutor {
                     }
                 }
                 ex.sendResponseHeaders(404, 0)
-                ex.responseBody << "<invalidInput/>"
+                ex.responseBody << request.text
                 ex.responseBody.close()
         })
     }
diff --git a/src/test/groovy/pl/touk/mockserver/client/Util.groovy b/src/test/groovy/pl/touk/mockserver/client/Util.groovy
index 889072a..ce9c939 100644
--- a/src/test/groovy/pl/touk/mockserver/client/Util.groovy
+++ b/src/test/groovy/pl/touk/mockserver/client/Util.groovy
@@ -28,4 +28,8 @@ class Util {
         EntityUtils.consumeQuietly(entity)
         return json
     }
+
+    static void consumeResponse(CloseableHttpResponse response) {
+        EntityUtils.consumeQuietly(response.entity)
+    }
 }
diff --git a/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy b/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy
index fc6828e..f7e2753 100644
--- a/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy
+++ b/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy
@@ -237,7 +237,7 @@ class MockServerIntegrationTest extends Specification {
             204        | 204
     }
 
-    def "should return response code 404 and error body when mocks does not apply"() {
+    def "should return response code 404 and error body the same as request body when mocks does not apply"() {
         given:
             controlServerClient.addMock(new AddMockRequestData(
                     name: 'testRest1',
@@ -253,7 +253,7 @@ class MockServerIntegrationTest extends Specification {
         then:
             response.statusLine.statusCode == 404
             GPathResult secondXmlResponse = Util.extractXmlResponse(response)
-            secondXmlResponse.name() == 'invalidInput'
+            secondXmlResponse.name() == 'request1'
     }
 
     def "should inform that there was problem during adding mock - invalid port"() {
@@ -473,8 +473,8 @@ class MockServerIntegrationTest extends Specification {
         when:
             CloseableHttpResponse badResponse = client.execute(badRestPost)
         then:
-            GPathResult badRestPostResponse = Util.extractXmlResponse(badResponse)
-            badRestPostResponse.name() == 'invalidInput'
+            badResponse.statusLine.statusCode == 404
+            Util.consumeResponse(badResponse)
         when:
             CloseableHttpResponse response = client.execute(restPost)
         then:
@@ -497,8 +497,8 @@ class MockServerIntegrationTest extends Specification {
         when:
             CloseableHttpResponse badResponse = client.execute(badRestPost)
         then:
-            GPathResult badRestPostResponse = Util.extractXmlResponse(badResponse)
-            badRestPostResponse.name() == 'invalidInput'
+            badResponse.statusLine.statusCode == 404
+            Util.consumeResponse(badResponse)
         when:
             CloseableHttpResponse response = client.execute(restPost)
         then:
@@ -522,8 +522,8 @@ class MockServerIntegrationTest extends Specification {
         when:
             CloseableHttpResponse badResponse = client.execute(badRestPost)
         then:
-            GPathResult badRestPostResponse = Util.extractXmlResponse(badResponse)
-            badRestPostResponse.name() == 'invalidInput'
+            badResponse.statusLine.statusCode == 404
+            Util.consumeResponse(badResponse)
         when:
             CloseableHttpResponse response = client.execute(restPost)
         then:
@@ -547,8 +547,8 @@ class MockServerIntegrationTest extends Specification {
         when:
             CloseableHttpResponse badResponse = client.execute(badRestPost)
         then:
-            GPathResult badRestPostResponse = Util.extractXmlResponse(badResponse)
-            badRestPostResponse.name() == 'invalidInput'
+            badResponse.statusLine.statusCode == 404
+            Util.consumeResponse(badResponse)
         when:
             CloseableHttpResponse response = client.execute(restPost)
         then: