From 28bc9225a8ca9515259ccdfc7b3e21af67615c1e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 22 Feb 2016 16:36:02 +0100 Subject: [PATCH] Fixed Jaxrs imports for JUnit in SingleTestGenerator. --- .../groovy/io/codearte/accurest/SingleTestGenerator.groovy | 2 +- .../io/codearte/accurest/SingleTestGeneratorSpec.groovy | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy index 42ca73417c..12fefbe155 100644 --- a/accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy +++ b/accurest-core/src/main/groovy/io/codearte/accurest/SingleTestGenerator.groovy @@ -53,7 +53,7 @@ class SingleTestGenerator { if (configProperties.testMode == TestMode.JAXRSCLIENT) { clazz.addStaticImport('javax.ws.rs.client.Entity.*') if (configProperties.targetFramework == TestFramework.JUNIT) { - clazz.addImport('import javax.ws.rs.core.Response') + clazz.addImport('javax.ws.rs.core.Response') } } else if (configProperties.testMode == TestMode.MOCKMVC) { clazz.addStaticImport('com.jayway.restassured.module.mockmvc.RestAssuredMockMvc.*') diff --git a/accurest-core/src/test/groovy/io/codearte/accurest/SingleTestGeneratorSpec.groovy b/accurest-core/src/test/groovy/io/codearte/accurest/SingleTestGeneratorSpec.groovy index 7d2254e27c..7496f83446 100644 --- a/accurest-core/src/test/groovy/io/codearte/accurest/SingleTestGeneratorSpec.groovy +++ b/accurest-core/src/test/groovy/io/codearte/accurest/SingleTestGeneratorSpec.groovy @@ -1,6 +1,7 @@ package io.codearte.accurest import io.codearte.accurest.config.AccurestConfigProperties +import io.codearte.accurest.config.TestMode import io.codearte.accurest.file.Contract import org.junit.Rule import org.junit.rules.TemporaryFolder @@ -67,6 +68,7 @@ class SingleTestGeneratorSpec extends Specification { def "should build JaxRs test class for #testFramework"() { given: AccurestConfigProperties properties = new AccurestConfigProperties(); + properties.testMode = TestMode.JAXRSCLIENT properties.targetFramework = testFramework Contract contract = new Contract(file.toPath(), true, 1, 2) contract.ignored >> true @@ -81,8 +83,8 @@ class SingleTestGeneratorSpec extends Specification { where: testFramework | classStrings - JUNIT | jUnitClassStrings - SPOCK | spockClassStrings + JUNIT | ['import static javax.ws.rs.client.Entity.*;', 'import javax.ws.rs.core.Response;'] + SPOCK | ['import static javax.ws.rs.client.Entity.*;'] }