diff --git a/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy b/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy index d90dab5..f79c0e0 100644 --- a/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy +++ b/src/main/groovy/pl/touk/mockserver/server/HttpMockServer.groovy @@ -44,7 +44,7 @@ class HttpMockServer { Closure predicate = Eval.me(request.predicate as String) as Closure Closure okResponse = Eval.me(request.response as String) as Closure boolean soap = Boolean.valueOf(request.soap as String) - Mock mock = new Mock(name, predicate, okResponse, soap) + Mock mock = new Mock(name, mockPath, mockPort, predicate, okResponse, soap) HttpServerWraper child = childServers.find { it.port == mockPort } if (!child) { child = new HttpServerWraper(mockPort) diff --git a/src/main/groovy/pl/touk/mockserver/server/Mock.groovy b/src/main/groovy/pl/touk/mockserver/server/Mock.groovy index d7110dc..c36e567 100644 --- a/src/main/groovy/pl/touk/mockserver/server/Mock.groovy +++ b/src/main/groovy/pl/touk/mockserver/server/Mock.groovy @@ -5,16 +5,24 @@ import groovy.transform.EqualsAndHashCode @EqualsAndHashCode(excludes = ["counter"]) class Mock { final String name + final String path + final int port final Closure predicate final Closure responseOk final boolean soap //TODO add http method + //TODO add http code + //TODO add request headers + //TODO add response headers int counter = 0 + //TODO add historical invocations - Mock(String name, Closure predicate, Closure responseOk, boolean soap) { + Mock(String name, String path, int port, Closure predicate, Closure responseOk, boolean soap) { this.name = name this.predicate = predicate this.responseOk = responseOk this.soap = soap + this.path = path + this.port = port } } diff --git a/src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy b/src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy index e300994..994f829 100644 --- a/src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy +++ b/src/test/groovy/pl/touk/mockserver/client/ControlServerClient.groovy @@ -16,12 +16,14 @@ class ControlServerClient { address = "http://$host:$port/serverControl" } - boolean addMock(AddMockRequestData addMockRequestData){ + void addMock(AddMockRequestData addMockRequestData){ HttpPost addMockPost = new HttpPost(address) addMockPost.entity = buildAddMockRequest(addMockRequestData) CloseableHttpResponse response = client.execute(addMockPost) GPathResult responseXml = Util.extractXmlResponse(response) - return responseXml.name() == 'mockAdded' + if(responseXml.name() != 'mockAdded'){ + throw new MockAlreadyExists() + } } int removeMock(String name){ @@ -29,7 +31,10 @@ class ControlServerClient { removeMockPost.entity = buildRemoveMockRequest(new RemoveMockRequestData(name:name)) CloseableHttpResponse response = client.execute(removeMockPost) GPathResult responseXml = Util.extractXmlResponse(response) - return responseXml.name() == 'mockRemoved' ? responseXml.text() as int:-1 + if(responseXml.name() == 'mockRemoved'){ + return responseXml.text() as int + } + throw new MockDoesNotExist() } diff --git a/src/test/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy b/src/test/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy new file mode 100644 index 0000000..6fce531 --- /dev/null +++ b/src/test/groovy/pl/touk/mockserver/client/MockAlreadyExists.groovy @@ -0,0 +1,3 @@ +package pl.touk.mockserver.client + +class MockAlreadyExists extends RuntimeException{} \ No newline at end of file diff --git a/src/test/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy b/src/test/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy new file mode 100644 index 0000000..881eb2c --- /dev/null +++ b/src/test/groovy/pl/touk/mockserver/client/MockDoesNotExist.groovy @@ -0,0 +1,4 @@ +package pl.touk.mockserver.client + +class MockDoesNotExist extends RuntimeException{ +} diff --git a/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy b/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy new file mode 100644 index 0000000..5738ce3 --- /dev/null +++ b/src/test/groovy/pl/touk/mockserver/server/MockServerIntegrationTest.groovy @@ -0,0 +1,233 @@ +package pl.touk.mockserver.server + +import groovy.util.slurpersupport.GPathResult +import org.apache.http.client.methods.CloseableHttpResponse +import org.apache.http.client.methods.HttpPost +import org.apache.http.entity.ContentType +import org.apache.http.entity.StringEntity +import org.apache.http.impl.client.CloseableHttpClient +import org.apache.http.impl.client.HttpClients +import pl.touk.mockserver.client.* +import spock.lang.Shared +import spock.lang.Specification +import spock.lang.Unroll + +class MockServerIntegrationTest extends Specification { + + ControlServerClient controlServerClient + + HttpMockServer httpMockServer + + @Shared + CloseableHttpClient client = HttpClients.createDefault() + + def setup() { + httpMockServer = new HttpMockServer(9000) + controlServerClient = new ControlServerClient('localhost', 9000) + } + + def cleanup() { + httpMockServer.stop() + } + + def "should add working rest mock on endpoint"() { + expect: + controlServerClient.addMock(new AddMockRequestData( + name: 'testRest', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: false + )) + when: + HttpPost restPost = new HttpPost('http://localhost:9999/testEndpoint') + restPost.entity = new StringEntity('', ContentType.create("text/xml", "UTF-8")) + CloseableHttpResponse response = client.execute(restPost) + then: + GPathResult restPostResponse = Util.extractXmlResponse(response) + restPostResponse.name() == 'goodResponseRest-request' + expect: + controlServerClient.removeMock('testRest') == 1 + } + + def "should add soap mock on endpoint"() { + expect: + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: true + )) + when: + HttpPost soapPost = new HttpPost('http://localhost:9999/testEndpoint') + soapPost.entity = new StringEntity(Util.soap(''), ContentType.create("text/xml", "UTF-8")) + CloseableHttpResponse response = client.execute(soapPost) + then: + GPathResult soapPostResponse = Util.extractXmlResponse(response) + soapPostResponse.name() == 'Envelope' + soapPostResponse.Body.'goodResponseSoap-request'.size() == 1 + expect: + controlServerClient.removeMock('testSoap') == 1 + } + + def "should not remove when it does not exist"() { + when: + controlServerClient.removeMock('testSoap') + then: + thrown(MockDoesNotExist) + expect: + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: true + )) + and: + controlServerClient.removeMock('testSoap') == 0 + when: + controlServerClient.removeMock('testSoap') + then: + thrown(MockDoesNotExist) + } + + def "should not add mock with existing name"() { + expect: + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: true + )) + when: + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint2', + port: 9998, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: true + )) + then: + thrown(MockAlreadyExists) + } + + def "should add mock after deleting old mock with the same name"() { + expect: + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: true + )) + and: + controlServerClient.removeMock('testSoap') == 0 + and: + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request2'}''', + response: '''{xml -> ""}''', + soap: true + )) + } + + def "should add simultaneously working post and rest mocks with the same predicate and endpoint nad port"() { + given: + controlServerClient.addMock(new AddMockRequestData( + name: 'testRest', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''' + )) + controlServerClient.addMock(new AddMockRequestData( + name: 'testSoap', + path: '/testEndpoint', + port: 9999, + predicate: '''{xml -> xml.name() == 'request'}''', + response: '''{xml -> ""}''', + soap: true + )) + HttpPost restPost = new HttpPost('http://localhost:9999/testEndpoint') + restPost.entity = new StringEntity('', ContentType.create("text/xml", "UTF-8")) + HttpPost soapPost = new HttpPost('http://localhost:9999/testEndpoint') + soapPost.entity = new StringEntity(Util.soap(''), ContentType.create("text/xml", "UTF-8")) + when: + CloseableHttpResponse restResponse = client.execute(restPost) + then: + GPathResult restPostResponse = Util.extractXmlResponse(restResponse) + restPostResponse.name() == 'goodResponseRest-request' + when: + CloseableHttpResponse soapResponse = client.execute(soapPost) + then: + GPathResult soapPostResponse = Util.extractXmlResponse(soapResponse) + soapPostResponse.name() == 'Envelope' + soapPostResponse.Body.'goodResponseSoap-request'.size() == 1 + } + + @Unroll + def "should dispatch rest mocks when second on #name"() { + given: + controlServerClient.addMock(new AddMockRequestData( + name: 'testRest1', + path: '/test1', + port: 9999, + predicate: '''{xml -> xml.name() == 'request1'}''', + response: '''{xml -> ""}''' + )) + controlServerClient.addMock(new AddMockRequestData( + name: 'testRest2', + path: secondPath, + port: secondPort, + predicate: '''{xml -> xml.name() == 'request2'}''', + response: '''{xml -> ""}''' + )) + HttpPost firstRequest = new HttpPost('http://localhost:9999/test1') + firstRequest.entity = new StringEntity('', ContentType.create("text/xml", "UTF-8")) + HttpPost secondRequest = new HttpPost("http://localhost:${secondPort}${secondPath}") + secondRequest.entity = new StringEntity('', ContentType.create("text/xml", "UTF-8")) + when: + CloseableHttpResponse firstResponse = client.execute(firstRequest) + then: + GPathResult firstXmlResponse = Util.extractXmlResponse(firstResponse) + firstXmlResponse.name() == 'goodResponseRest1' + when: + CloseableHttpResponse secondResponse = client.execute(secondRequest) + then: + GPathResult secondXmlResponse = Util.extractXmlResponse(secondResponse) + secondXmlResponse.name() == 'goodResponseRest2' + where: + secondPort | secondPath | name + 9999 | '/test1' | 'the same port and path' + 9998 | '/test1' | 'the same path and another port' + 9999 | '/test2' | 'the same port and another path' + 9998 | '/test2' | 'another port and path' + } + + //TODO def "should get mock report"(){} + //TODO def "should get list mocks"(){} + //TODO def "should dispatch rest mock with response code"(){} + //TODO def "should dispatch rest mock with post method"(){} + //TODO def "should dispatch rest mock with post method and request headers"(){} + //TODO def "should dispatch rest mock with post method and response headers"(){} + //TODO def "should dispatch rest mock with get method"(){} + //TODO def "should dispatch rest mock with get method and request headers"(){} + //TODO def "should dispatch rest mock with get method and response headers"(){} + //TODO def "should dispatch rest mock with put method"(){} + //TODO def "should dispatch rest mock with put method and request headers"(){} + //TODO def "should dispatch rest mock with put method and response headers"(){} + //TODO def "should dispatch rest mock with delete method"(){} + //TODO def "should dispatch rest mock with delete method and request headers"(){} + //TODO def "should dispatch rest mock with delete method and response headers"(){} + //TODO def "should dispatch rest mocks with all methods"(){} +} diff --git a/src/test/groovy/pl/touk/mockserver/server/MockServerTest.groovy b/src/test/groovy/pl/touk/mockserver/server/MockServerTest.groovy deleted file mode 100644 index 1684414..0000000 --- a/src/test/groovy/pl/touk/mockserver/server/MockServerTest.groovy +++ /dev/null @@ -1,103 +0,0 @@ -package pl.touk.mockserver.server - -import pl.touk.mockserver.server.HttpMockServer -import groovy.util.slurpersupport.GPathResult -import org.apache.http.client.methods.CloseableHttpResponse -import org.apache.http.client.methods.HttpPost -import org.apache.http.entity.ContentType -import org.apache.http.entity.StringEntity -import org.apache.http.impl.client.CloseableHttpClient -import org.apache.http.impl.client.HttpClients -import pl.touk.mockserver.client.AddMockRequestData -import pl.touk.mockserver.client.ControlServerClient -import pl.touk.mockserver.client.Util -import spock.lang.Shared -import spock.lang.Specification - -class MockServerTest extends Specification{ - - ControlServerClient controlServerClient - - HttpMockServer httpMockServer - - @Shared - CloseableHttpClient client = HttpClients.createDefault() - - def setup(){ - httpMockServer = new HttpMockServer(9000) - controlServerClient = new ControlServerClient('localhost', 9000) - } - - def cleanup(){ - httpMockServer.stop() - } - - def "should add working rest mock on endpoint"(){ - expect: - controlServerClient.addMock(new AddMockRequestData( - name: 'testRest', - path: '/testEndpoint', - port: 9999, - predicate: '''{xml -> xml.name() == 'request'}''', - response: '''{xml -> ""}''', - soap: false - )) - when: - HttpPost restPost = new HttpPost('http://localhost:9999/testEndpoint') - restPost.entity = new StringEntity('',ContentType.create("text/xml", "UTF-8")) - CloseableHttpResponse response = client.execute(restPost) - then: - GPathResult restPostResponse = Util.extractXmlResponse(response) - restPostResponse.name() == 'goodResponseRest-request' - expect: - controlServerClient.removeMock('testRest') == 1 - } - - def "should add soap mock on endpoint"(){ - expect: - controlServerClient.addMock(new AddMockRequestData( - name: 'testSoap', - path: '/testEndpoint', - port: 9999, - predicate: '''{xml -> xml.name() == 'request'}''', - response: '''{xml -> ""}''', - soap: true - )) - when: - HttpPost restPost = new HttpPost('http://localhost:9999/testEndpoint') - restPost.entity = new StringEntity(Util.soap(''),ContentType.create("text/xml", "UTF-8")) - CloseableHttpResponse response = client.execute(restPost) - then: - GPathResult restPostResponse = Util.extractXmlResponse(response) - restPostResponse.name() == 'Envelope' - restPostResponse.Body.'goodResponseSoap-request'.size() == 1 - expect: - controlServerClient.removeMock('testSoap') == 1 - } - -//TODO def "should add simultaneously working post and rest mocks with the same predicate and endpoint nad port"(){}" - //TODO def "should add mock minimal(){}" - //TODO def "should dispatch mocks with the same predicates on another ports" - //TODO def "should not add mock with existing name"(){} - //TODO def "should not remove the same mock two times"(){} - //TODO def "should add mock after deleteing old mock with the same name"(){} - //TODO def "should dispatch rest mocks with the another predicates"(){} - //TODO def "should dispatch soap mocks with the another predicates"(){} - //TODO def "should dispatch rest and soap mocks with the same predicates"(){} - //TODO def "should get mock report"(){} - //TODO def "should get list mocks"(){} - //TODO def "should dispatch rest mock with response code"(){} - //TODO def "should dispatch rest mock with post method"(){} - //TODO def "should dispatch rest mock with post method and request headers"(){} - //TODO def "should dispatch rest mock with post method and response headers"(){} - //TODO def "should dispatch rest mock with get method"(){} - //TODO def "should dispatch rest mock with get method and request headers"(){} - //TODO def "should dispatch rest mock with get method and response headers"(){} - //TODO def "should dispatch rest mock with put method"(){} - //TODO def "should dispatch rest mock with put method and request headers"(){} - //TODO def "should dispatch rest mock with put method and response headers"(){} - //TODO def "should dispatch rest mock with delete method"(){} - //TODO def "should dispatch rest mock with delete method and request headers"(){} - //TODO def "should dispatch rest mock with delete method and response headers"(){} - //TODO def "should dispatch rest mocks with all methods"(){} -}