From dd4635fe95087234c9ade918c022d125921076c7 Mon Sep 17 00:00:00 2001 From: Jakub Kubrynski Date: Sat, 21 Feb 2015 21:02:39 +0100 Subject: [PATCH] Removed server side stubs generation --- .../DslToWiremockServerConverter.groovy | 13 -- .../DslToWiremockServerConverterSpec.groovy | 29 --- .../dsl/WiremockRequestStubStrategy.groovy | 14 -- .../dsl/WiremockResponseStubStrategy.groovy | 12 -- .../accurest/dsl/WiremockStubStrategy.groovy | 5 - .../dsl/WiremockGroovyDslResponseSpec.groovy | 48 +---- .../accurest/dsl/WiremockGroovyDslSpec.groovy | 180 ------------------ 7 files changed, 2 insertions(+), 299 deletions(-) delete mode 100644 accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverter.groovy delete mode 100644 accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverterSpec.groovy diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverter.groovy deleted file mode 100644 index ad62c8cc74..0000000000 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverter.groovy +++ /dev/null @@ -1,13 +0,0 @@ -package io.codearte.accurest.wiremock - -import groovy.transform.CompileStatic -import io.coderate.accurest.dsl.WiremockStubStrategy - -@CompileStatic -class DslToWiremockServerConverter extends DslToWiremockConverter { - - @Override - String convertContent(String dslBody) { - return new WiremockStubStrategy(createGroovyDSLfromStringContent(dslBody)).toWiremockServerStub() - } -} diff --git a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverterSpec.groovy b/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverterSpec.groovy deleted file mode 100644 index b11f4460b3..0000000000 --- a/accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/DslToWiremockServerConverterSpec.groovy +++ /dev/null @@ -1,29 +0,0 @@ -package io.codearte.accurest.wiremock - -import groovy.json.JsonSlurper -import spock.lang.Specification - -class DslToWiremockServerConverterSpec extends Specification { - - def "should convert DSL file to Wiremock JSON"() { - given: - def converter = new DslToWiremockServerConverter() - and: - String dslBody = """ - io.coderate.accurest.dsl.GroovyDsl.make { - request { - method('PUT') - urlPattern \$(client('/[0-9]{2}'), server('/12')) - } - response { - status 200 - } - } -""" - when: - String json = converter.convertContent(dslBody) - then: - new JsonSlurper().parseText(json) == new JsonSlurper().parseText(""" -{"request":{"method":"PUT","urlPattern":"/12"},"response":{"status":200}}""") - } -} diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy index d572d30a61..0f0e803059 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockRequestStubStrategy.groovy @@ -21,11 +21,6 @@ class WiremockRequestStubStrategy extends BaseWiremockStubStrategy { return buildRequestContent(new ClientRequest(request)) } - @PackageScope - Map buildServerRequestContent() { - return buildRequestContent(new ServerRequest(request)) - } - private Map buildRequestContent(ClientRequest request) { return [method : request?.method?.clientValue, url : request?.url?.clientValue, @@ -36,13 +31,4 @@ class WiremockRequestStubStrategy extends BaseWiremockStubStrategy { ].findAll { it.value } } - private Map buildRequestContent(ServerRequest request) { - return [method : request?.method?.serverValue, - url : request?.url?.serverValue, - urlPattern: request?.urlPattern?.serverValue, - urlPath : request?.urlPath?.serverValue, - headers : buildServerHeadersSection(request.headers), - body : request?.body?.serverValue - ].findAll { it.value } - } } diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy index 740a3e69a1..2f27d4293d 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy @@ -21,21 +21,9 @@ class WiremockResponseStubStrategy extends BaseWiremockStubStrategy { return buildResponseContent(new ClientResponse(response)) } - @PackageScope - Map buildServerResponseContent() { - return buildResponseContent(new ServerResponse(response)) - } - private Map buildResponseContent(ClientResponse response) { return [status : response?.status?.clientValue, body : response?.body?.clientValue, headers: buildClientHeadersSection(response.headers)].findAll { it.value } } - - private Map buildResponseContent(ServerResponse response) { - return [status : response?.status?.serverValue, - body : response?.body?.serverValue, - headers: buildServerHeadersSection(response.headers)].findAll { it.value } - } - } diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy index 4888537ec3..b6f1bcdf4b 100644 --- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy +++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockStubStrategy.groovy @@ -18,9 +18,4 @@ class WiremockStubStrategy { return JsonOutput.prettyPrint(JsonOutput.toJson([request : wiremockRequestStubStrategy.buildClientRequestContent(), response: wiremockResponseStubStrategy.buildClientResponseContent()])) } - - String toWiremockServerStub() { - return JsonOutput.prettyPrint(JsonOutput.toJson([request : wiremockRequestStubStrategy.buildServerRequestContent(), - response: wiremockResponseStubStrategy.buildServerResponseContent()])) - } } diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy index 400ceadbf9..eba8b29783 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslResponseSpec.groovy @@ -7,7 +7,7 @@ import spock.lang.Specification class WiremockGroovyDslResponseSpec extends Specification { - def 'should generate response without body for #side side'() { + def 'should generate response without body for client side'() { given: GroovyDsl dsl = GroovyDsl.make { response { @@ -15,9 +15,8 @@ class WiremockGroovyDslResponseSpec extends Specification { } } expect: - new WiremockResponseStubStrategy(dsl)."build${side}ResponseContent"() == new JsonSlurper().parseText(expectedStub) + new WiremockResponseStubStrategy(dsl).buildClientResponseContent() == new JsonSlurper().parseText(expectedStub) where: - side << ['Client', 'Server'] expectedStub << [''' { "status": 200 @@ -54,47 +53,4 @@ class WiremockGroovyDslResponseSpec extends Specification { ''') } - def 'should generate headers for response for server side'() { - given: - GroovyDsl dsl = GroovyDsl.make { - response { - status 200 - headers { - header('Content-Type').matches $(client('text/xml'), server('text/*')) - } - } - } - expect: - new WiremockResponseStubStrategy(dsl).buildServerResponseContent() == new JsonSlurper().parseText(''' - { - "status": 200, - "headers": { - "Content-Type": { - "matches": "text/*" - } - } - } - ''') - } - - def 'should generate an exact header for response for both sides '() { - given: - GroovyDsl dsl = GroovyDsl.make { - response { - status 200 - headers { - header 'Content-Type': 'text/xml' - } - } - } - expect: - new WiremockResponseStubStrategy(dsl).buildServerResponseContent() == new JsonSlurper().parseText(''' - { - "status": 200, - "headers": { - "Content-Type": "text/xml" - } - } - ''') - } } diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy index 47e6a7cfd1..165a4584fc 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/dsl/WiremockGroovyDslSpec.groovy @@ -159,105 +159,6 @@ class WiremockGroovyDslSpec extends Specification { ''') } - def 'should convert groovy dsl stub with Body as String to wiremock stub for the server side'() { - given: - GroovyDsl groovyDsl = GroovyDsl.make { - request { - method('GET') - urlPattern $(client('/[0-9]{2}'), server('/12')) - } - response { - status 200 - body("""\ - { - "id": "${value(client('123'), server('321'))}", - "surname": "${value(client('Kowalsky'), server('Lewandowski'))}", - "name": "Jan", - "created" : "${$(client('2014-02-02 12:23:43'), server('2999-09-09 01:23:45'))}" - } - """ - ) - headers { - header 'Content-Type': 'text/plain' - } - } - } - when: - String wiremockStub = new WiremockStubStrategy(groovyDsl).toWiremockServerStub() - then: - new JsonSlurper().parseText(wiremockStub) == new JsonSlurper().parseText(''' -{ - "request": { - "method": "GET", - "urlPattern": "/12" - }, - "response": { - "status": 200, - "body": { - "id": "321", - "surname": "Lewandowski", - "name": "Jan", - "created" : "2999-09-09 01:23:45" - }, - "headers": { - "Content-Type": "text/plain" - } - } -} -''') - } - - def 'should convert groovy dsl stub to wiremock stub for the server side'() { - given: - GroovyDsl groovyDsl = GroovyDsl.make { - request { - method('GET') - urlPattern $(client('/[0-9]{2}'), server('/12')) - } - response { - status(200) - body( - id: value( - client('123'), - server('321') - ), - surname: $( - client('Kowalsky'), - server('Lewandowski') - ), - name: 'Jan', - created: $(client('2014-02-02 12:23:43'), server('1999-01-01 01:23:45')) - ) - headers { - header('Content-Type': 'text/plain') - } - } - } - when: - String wiremockStub = new WiremockStubStrategy(groovyDsl).toWiremockServerStub() - then: - new JsonSlurper().parseText(wiremockStub) == new JsonSlurper().parseText(''' -{ - "request": { - "method": "GET", - "urlPattern": "/12" - }, - "response": { - "status": 200, - "body": { - "id": "321", - "surname": "Lewandowski", - "name": "Jan", - "created" : "1999-01-01 01:23:45" - }, - "headers": { - "Content-Type": "text/plain" - } - } -} -''') - } - def "should generate stub with GET"() { given: GroovyDsl groovyDsl = GroovyDsl.make { @@ -308,24 +209,6 @@ class WiremockGroovyDslSpec extends Specification { ''') } - def "should generate stub with urlPattern for server side"() { - given: - GroovyDsl groovyDsl = GroovyDsl.make { - request { - urlPattern $( - client('/[0-9]{2}'), - server('/12') - ) - } - } - expect: - new WiremockRequestStubStrategy(groovyDsl).buildServerRequestContent() == new JsonSlurper().parseText(''' - { - "urlPattern":"/12" - } - ''') - } - def "should generate stub with urlPath for client side"() { given: GroovyDsl groovyDsl = GroovyDsl.make { @@ -341,21 +224,6 @@ class WiremockGroovyDslSpec extends Specification { ''') } - def "should generate stub with urlPath for server side"() { - given: - GroovyDsl groovyDsl = GroovyDsl.make { - request { - urlPath('/12') - } - } - expect: - new WiremockRequestStubStrategy(groovyDsl).buildClientRequestContent() == new JsonSlurper().parseText(''' - { - "urlPath":"/12" - } - ''') - } - def "should generate stub with some headers section for client side"() { given: GroovyDsl groovyDsl = GroovyDsl.make { @@ -397,52 +265,4 @@ class WiremockGroovyDslSpec extends Specification { } ''') } - - def "should generate stub with some headers section for server side"() { - given: - GroovyDsl groovyDsl = GroovyDsl.make { - request { - headers { - header('Content-Type').equalTo('text/xml') - header('Accept').matches $( - client('text/.*'), - server('text/plain') - ) - header('etag').doesNotMatch $( - client('abcd.*'), - server('abcdef') - ) - header('X-Custom-Header').contains $( - client('2134'), - server('121345') - ) - } - } - } - expect: - new WiremockRequestStubStrategy(groovyDsl).buildServerRequestContent() == new JsonSlurper().parseText(''' - { - "headers": { - "Content-Type": { - "equalTo": "text/xml" - }, - "Accept": { - "matches": "text/plain" - }, - "etag": { - "doesNotMatch": "abcdef" - }, - "X-Custom-Header": { - "contains": "121345" - } - } - } - ''') - } - - @Ignore("Not implemented yet") - def "should generate stub with request body matching for server side"() {} - - @Ignore("Not implemented yet") - def "should generate stub with request query parameter matching for server side"() {} }