diff --git a/src/main/groovy/eu/coderate/accurest/TestGenerator.groovy b/src/main/groovy/eu/coderate/accurest/TestGenerator.groovy index 06264a7bed..e44342920e 100644 --- a/src/main/groovy/eu/coderate/accurest/TestGenerator.groovy +++ b/src/main/groovy/eu/coderate/accurest/TestGenerator.groovy @@ -4,7 +4,7 @@ import eu.coderate.accurest.builder.ClassBuilder import eu.coderate.accurest.util.NamesUtil import static eu.coderate.accurest.builder.ClassBuilder.createClass -import static eu.coderate.accurest.builder.MethodBuilder.createVoidMethod +import static eu.coderate.accurest.builder.MethodBuilder.createTestMethod /** * @author Jakub Kubrynski @@ -50,7 +50,7 @@ class TestGenerator { .addStaticImport('com.jayway.restassured.matcher.RestAssuredMatchers.*') .addRule('com.test.MyRule') directory.listFiles().each { - clazz.addMethod(createVoidMethod(it)) + clazz.addMethod(createTestMethod(it)) } return clazz.build() } diff --git a/src/main/groovy/eu/coderate/accurest/builder/MethodBuilder.groovy b/src/main/groovy/eu/coderate/accurest/builder/MethodBuilder.groovy index c9e7568a51..25692663d2 100644 --- a/src/main/groovy/eu/coderate/accurest/builder/MethodBuilder.groovy +++ b/src/main/groovy/eu/coderate/accurest/builder/MethodBuilder.groovy @@ -9,24 +9,22 @@ import groovy.json.JsonSlurper class MethodBuilder { private final String methodName - private final String returnType private final Map stubContent - private MethodBuilder(String returnType, String methodName, Map stubContent) { + private MethodBuilder(String methodName, Map stubContent) { this.stubContent = stubContent - this.returnType = returnType this.methodName = methodName } - static MethodBuilder createVoidMethod(File stubsFile) { + static MethodBuilder createTestMethod(File stubsFile) { Map stubContent = new JsonSlurper().parse(stubsFile) String methodName = NamesUtil.uncapitalize(NamesUtil.toLastDot(NamesUtil.afterLast(stubsFile.path, File.separator))) - return new MethodBuilder("void", methodName, stubContent) + return new MethodBuilder(methodName, stubContent) } void appendTo(BlockBuilder blockBuilder) { blockBuilder.addLine('@Test') - blockBuilder.addLine("public $returnType $methodName() {") + blockBuilder.addLine("public void $methodName() {") new MethodBodyBuilder(stubContent).appendTo(blockBuilder) blockBuilder.addLine('}') }