stawros/http-mock-server
1
0
Fork 0
Code Releases Packages Activity

Refactor response generation and xmls

Browse source
This commit is contained in:
Dominik Adam Przybysz 2014-12-13 21:49:24 +01:00
parent ba63d36fa0
commit 0bfa0d91b4
8 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/groovy/pl/touk/mockserver/server/ContextExecutor.groovy
View file

@ -30,9 +30,7 @@ class ContextExecutor {
e.printStackTrace()
}
}
ex.sendResponseHeaders(404, 0)
ex.responseBody << request.text
ex.responseBody.close()
Util.createResponse(ex, request.text, 404)
})
}
@ -48,12 +46,7 @@ class ContextExecutor {
response.headers.each {
httpExchange.responseHeaders.add(it.key, it.value)
}
String responseText = response.response
httpExchange.sendResponseHeaders(response.statusCode, responseText ? responseText.length() : -1)
if (responseText) {
httpExchange.responseBody << responseText
httpExchange.responseBody.close()
}
Util.createResponse(httpExchange, response.text, response.statusCode)
}
int removeMock(String name) {

39
src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy
View file

@ -3,10 +3,13 @@ package pl.touk.mockserver.server
import com.sun.net.httpserver.HttpExchange
import groovy.transform.PackageScope
import groovy.util.slurpersupport.GPathResult
import groovy.xml.MarkupBuilder
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.CopyOnWriteArraySet
import static pl.touk.mockserver.server.Util.createResponse
@PackageScope
class HttpMockServer {
@ -34,7 +37,6 @@ class HttpMockServer {
} else {
throw new RuntimeException('Unknown request')
}
//TODO add get mock report
} catch (Exception e) {
createErrorResponse(ex, e)
}
@ -42,10 +44,19 @@ class HttpMockServer {
}
void listMocks(HttpExchange ex) {
String response = '<mocks>' + listMocks().join('') + '</mocks>'
ex.sendResponseHeaders(200, 0)
ex.responseBody << response
ex.responseBody.close()
StringWriter sw = new StringWriter()
MarkupBuilder builder = new MarkupBuilder(sw)
builder.mocks {
listMocks().each {
Mock mock ->
builder.mock {
name mock.name
path mock.path
port mock.port
}
}
}
createResponse(ex, sw.toString(), 200)
}
Set<Mock> listMocks() {
@ -61,9 +72,7 @@ class HttpMockServer {
HttpServerWraper child = getOrCreateChildServer(mock.port)
child.addMock(mock)
mockNames << name
ex.sendResponseHeaders(200, 0)
ex.responseBody << '<mockAdded/>'
ex.responseBody.close()
createResponse(ex, '<mockAdded/>', 200)
}
private static Mock mockFromRequest(GPathResult request) {
@ -97,15 +106,17 @@ class HttpMockServer {
println "Removing $name"
int used = childServers.inject(0) { int res, HttpServerWraper server -> server.removeMock(name) + res }
mockNames.remove(name)
ex.sendResponseHeaders(200, 0)
ex.responseBody << "<mockRemoved>$used</mockRemoved>"
ex.responseBody.close()
StringWriter sw = new StringWriter()
MarkupBuilder builder = new MarkupBuilder(sw)
builder.mockRemoved used
createResponse(ex, sw.toString(), 200)
}
private static void createErrorResponse(HttpExchange ex, Exception e) {
ex.sendResponseHeaders(400, 0)
ex.responseBody << """<exceptionOccured>${e.message}</exceptionOccured>"""
ex.responseBody.close()
StringWriter sw = new StringWriter()
MarkupBuilder builder = new MarkupBuilder(sw)
builder.exceptionOccured e.message
createResponse(ex, sw.toString(), 400)
}
void stop() {

5
src/main/groovy/pl/touk/mockserver/server/Mock.groovy
View file

@ -82,11 +82,6 @@ class Mock implements Comparable<Mock>{
}
}
@Override
public String toString() {
return """<mock><port>$port</port><path>$path</path><name>$name</name></mock>"""
}
@Override
int compareTo(Mock o) {
return name.compareTo(o.name)

6
src/main/groovy/pl/touk/mockserver/server/MockResponse.groovy
View file

@ -5,12 +5,12 @@ import groovy.transform.PackageScope
@PackageScope
class MockResponse {
final int statusCode
final String response
final String text
final Map<String, String> headers
MockResponse(int statusCode, String response, Map<String, String> headers) {
MockResponse(int statusCode, String text, Map<String, String> headers) {
this.statusCode = statusCode
this.response = response
this.text = text
this.headers = headers
}
}

13
src/main/groovy/pl/touk/mockserver/server/Util.groovy Normal file
View file

@ -0,0 +1,13 @@
package pl.touk.mockserver.server
import com.sun.net.httpserver.HttpExchange
class Util {
static void createResponse(HttpExchange ex, String response, int statusCode) {
ex.sendResponseHeaders(statusCode, response ? response.length() : -1)
if (response) {
ex.responseBody << response
ex.responseBody.close()
}
}
}

1
src/test/groovy/pl/touk/mockserver/client/Util.groovy
View file

@ -13,6 +13,7 @@ import org.apache.http.util.EntityUtils
class Util {
static GPathResult extractXmlResponse(CloseableHttpResponse response) {
HttpEntity entity = response.entity
GPathResult xml = new XmlSlurper().parseText(EntityUtils.toString(entity))
EntityUtils.consumeQuietly(entity)
return xml

1
src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy
View file

@ -11,6 +11,7 @@ import pl.touk.mockserver.client.*
import spock.lang.Shared
import spock.lang.Specification
import spock.lang.Unroll
import pl.touk.mockserver.client.Util
class MockServerIntegrationTest extends Specification {

6
src/test/groovy/pl/touk/mockserver/server/ServerMockPT.groovy
View file

@ -29,10 +29,10 @@ class ServerMockPT extends Specification {
int port = 9000 + (current % 7)
controlServerClient.addMock(new AddMockRequestData(
name: "testRest$current",
path: "/testEndpoint$endpointNumber",
path: "testEndpoint$endpointNumber",
port: port,
predicate: """{xml -> xml.name() == 'request$current'}""",
response: """{xml -> "<goodResponse$current/>"}"""
predicate: """{req -> req.xml.name() == 'request$current'}""",
response: """{req -> "<goodResponse$current/>"}"""
))
HttpPost restPost = new HttpPost("http://localhost:$port/testEndpoint$endpointNumber")
restPost.entity = new StringEntity("<request$current/>", ContentType.create("text/xml", "UTF-8"))