SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-02-21 08:29:04 +01:00
parent 4f477739e0 fbf9def4c1
commit d81656551e
6 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/spring-cloud-contract-docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:18.10
FROM ubuntu:19.10
ARG SDKMAN_JAVA_INSTALLATION=8.0.242.hs-adpt

2
docker/spring-cloud-contract-stub-runner-docker/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:18.10
FROM ubuntu:19.10
ARG SDKMAN_JAVA_INSTALLATION=8.0.242.hs-adpt

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnit4IgnoreMethodAnnotation.java
View File

@@ -46,7 +46,7 @@ class JUnit4IgnoreMethodAnnotation implements MethodAnnotations {
public boolean accept(SingleContractMetadata singleContractMetadata) {
return this.generatedClassMetaData.configProperties
.getTestFramework() == TestFramework.JUNIT
&& this.generatedClassMetaData.isAnyIgnored();
&& singleContractMetadata.getContractMetadata().isIgnored();
}
}

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JUnit5IgnoreMethodAnnotation.java
View File

@@ -46,7 +46,7 @@ class JUnit5IgnoreMethodAnnotation implements MethodAnnotations {
public boolean accept(SingleContractMetadata singleContractMetadata) {
return this.generatedClassMetaData.configProperties
.getTestFramework() == TestFramework.JUNIT5
&& this.generatedClassMetaData.isAnyIgnored();
&& singleContractMetadata.getContractMetadata().isIgnored();
}
}

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SpockIgnoreMethodAnnotation.java
View File

@@ -46,7 +46,7 @@ class SpockIgnoreMethodAnnotation implements MethodAnnotations {
public boolean accept(SingleContractMetadata singleContractMetadata) {
return this.generatedClassMetaData.configProperties
.getTestFramework() == TestFramework.SPOCK
&& this.generatedClassMetaData.isAnyIgnored();
&& singleContractMetadata.getContractMetadata().isIgnored();
}
}

52
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy
View File

@@ -28,7 +28,6 @@ import org.springframework.cloud.contract.verifier.config.TestFramework
import org.springframework.cloud.contract.verifier.file.ContractMetadata
import org.springframework.cloud.contract.verifier.util.SyntaxChecker
import org.springframework.util.FileSystemUtils
import org.springframework.util.StringUtils
import static org.springframework.cloud.contract.verifier.config.TestFramework.JUNIT
import static org.springframework.cloud.contract.verifier.config.TestFramework.JUNIT5
@@ -38,6 +37,7 @@ import static org.springframework.cloud.contract.verifier.config.TestMode.EXPLIC
import static org.springframework.cloud.contract.verifier.config.TestMode.JAXRSCLIENT
import static org.springframework.cloud.contract.verifier.config.TestMode.MOCKMVC
import static org.springframework.cloud.contract.verifier.util.ContractVerifierDslConverter.convertAsCollection
import static org.springframework.util.StringUtils.countOccurrencesOf
class SingleTestGeneratorSpec extends Specification {
@@ -279,14 +279,14 @@ class SingleTestGeneratorSpec extends Specification {
textAssertion(clazz)
where:
testFramework | mode | classStrings | asserter | textAssertion
JUNIT | MOCKMVC | mockMvcJUnitRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
JUNIT | EXPLICIT | explicitJUnitRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
JUNIT5 | MOCKMVC | mockMvcJUnit5RestAssured3ClassStrings | JAVA_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
JUNIT5 | EXPLICIT | explicitJUnit5RestAssured3ClassStrings | JAVA_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
TESTNG | MOCKMVC | mockMvcTestNGRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
TESTNG | EXPLICIT | explicitTestNGRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
SPOCK | MOCKMVC | spockClassRestAssured3Strings | GROOVY_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
SPOCK | EXPLICIT | explicitSpockRestAssured2ClassStrings | GROOVY_ASSERTER | { String test -> StringUtils.countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification request') == 2 }
JUNIT | MOCKMVC | mockMvcJUnitRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
JUNIT | EXPLICIT | explicitJUnitRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
JUNIT5 | MOCKMVC | mockMvcJUnit5RestAssured3ClassStrings | JAVA_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
JUNIT5 | EXPLICIT | explicitJUnit5RestAssured3ClassStrings | JAVA_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
TESTNG | MOCKMVC | mockMvcTestNGRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
TESTNG | EXPLICIT | explicitTestNGRestAssured3ClassStrings | JAVA_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
SPOCK | MOCKMVC | spockClassRestAssured3Strings | GROOVY_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification') == 2 }
SPOCK | EXPLICIT | explicitSpockRestAssured2ClassStrings | GROOVY_ASSERTER | { String test -> countOccurrencesOf(test, '\t\t\tMockMvcRequestSpecification request') == 2 }
}
def 'should build JaxRs test class for #testFramework'() {
@@ -409,6 +409,40 @@ class SingleTestGeneratorSpec extends Specification {
SPOCK | spockClassRestAssured3Strings | '@Ignore' | GROOVY_ASSERTER
}
@Issue('#1326')
def 'should only ignore test for ignored contract if contract is ignored by configuration #testFramework'() {
given:
File fileToIgnore = tmpFolder.newFile("toIgnore.groovy")
writeContract(fileToIgnore)
ContractMetadata contractToIgnore = new ContractMetadata(fileToIgnore.toPath(),
true, 2, 1, convertAsCollection(new File('/'), fileToIgnore))
and:
File fileToCheck = tmpFolder.newFile("toCheck.groovy")
writeContract(fileToCheck)
ContractMetadata contractToCheck = new ContractMetadata(fileToCheck.toPath(),
false, 2, 2, convertAsCollection(new File('/'), fileToCheck))
and:
ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties()
properties.testFramework = testFramework
properties.ignoredFiles = [fileToIgnore.name]
and:
JavaTestGenerator testGenerator = new JavaTestGenerator()
when:
String clazz = testGenerator.buildClass(properties, [contractToCheck, contractToIgnore], 'com/foo',
new SingleTestGenerator.GeneratedClassData('test', 'test', file.toPath()))
then:
countOccurrencesOf(clazz, ignoreAnnotation) == 1
where:
testFramework | ignoreAnnotation
JUNIT | '@Ignore'
JUNIT5 | '@Disabled'
TESTNG | '@Test(enabled = false)'
SPOCK | '@Ignore'
}
def 'should not allow the usage of ignore annotations for TestNG '() {
given:
TestFramework testNG = TESTNG