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

Replaces deprecations

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-22 17:20:59 -05:00
parent 59759df5a3
commit f849dc40c9
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy
View File

@@ -21,7 +21,7 @@ import com.github.tomakehurst.wiremock.stubbing.StubMapping
import org.junit.Rule
import spock.lang.Specification
import org.springframework.boot.test.rule.OutputCapture
import org.springframework.boot.test.system.OutputCaptureRule
import org.springframework.boot.test.web.client.TestRestTemplate
import org.springframework.web.client.RestTemplate
@@ -30,7 +30,7 @@ class WireMockHttpServerStubSpec extends Specification {
final File MAPPING_DESCRIPTOR = new File('src/test/resources/transformers.json')
@Rule
OutputCapture capture = new OutputCapture()
OutputCaptureRule capture = new OutputCaptureRule()
def 'should describe stub mapping'() {
given:

4
spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ContractProjectUpdaterTest.java
View File

@@ -27,7 +27,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
import static org.assertj.core.api.BDDAssertions.then;
@@ -38,7 +38,7 @@ import static org.assertj.core.api.BDDAssertions.then;
public class ContractProjectUpdaterTest extends AbstractGitTest {
@Rule
public OutputCapture outputCapture = new OutputCapture();
public OutputCaptureRule outputCapture = new OutputCaptureRule();
File originalProject;

5
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy
View File

@@ -17,13 +17,12 @@
package org.springframework.cloud.contract.verifier.builder
import org.junit.Rule
import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification
import org.springframework.boot.test.rule.OutputCapture
import org.springframework.boot.test.system.OutputCaptureRule
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import org.springframework.cloud.contract.verifier.config.TestFramework
@@ -37,7 +36,7 @@ import org.springframework.cloud.contract.verifier.util.SyntaxChecker
class MethodBodyBuilderSpec extends Specification implements WireMockStubVerifier {
@Rule
OutputCapture capture = new OutputCapture()
OutputCaptureRule capture = new OutputCaptureRule()
@Shared
ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(

4
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy
View File

@@ -22,7 +22,7 @@ import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification
import org.springframework.boot.test.rule.OutputCapture
import org.springframework.boot.test.system.OutputCaptureRule
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import org.springframework.cloud.contract.verifier.config.TestFramework
@@ -34,7 +34,7 @@ import org.springframework.cloud.contract.verifier.util.SyntaxChecker
class MockMvcMethodBodyBuilderWithMatchersSpec extends Specification implements WireMockStubVerifier {
@Rule
OutputCapture outputCapture = new OutputCapture()
OutputCaptureRule outputCapture = new OutputCaptureRule()
@Shared
ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(

5
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy
View File

@@ -24,7 +24,7 @@ import spock.lang.Shared
import spock.lang.Specification
import spock.util.environment.RestoreSystemProperties
import org.springframework.boot.test.rule.OutputCapture
import org.springframework.boot.test.system.OutputCaptureRule
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import org.springframework.cloud.contract.verifier.config.TestFramework
@@ -32,6 +32,7 @@ import org.springframework.cloud.contract.verifier.config.TestMode
import org.springframework.cloud.contract.verifier.dsl.wiremock.WireMockStubVerifier
import org.springframework.cloud.contract.verifier.file.ContractMetadata
import org.springframework.cloud.contract.verifier.util.SyntaxChecker
/**
* @author Jakub Kubrynski, codearte.io
* @author Tim Ysewyn
@@ -39,7 +40,7 @@ import org.springframework.cloud.contract.verifier.util.SyntaxChecker
class SpringTestMethodBodyBuildersSpec extends Specification implements WireMockStubVerifier {
@Rule
OutputCapture capture = new OutputCapture()
OutputCaptureRule capture = new OutputCaptureRule()
@Shared
ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(

4
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/XmlMethodBodyBuilderSpec.groovy
View File

@@ -21,7 +21,7 @@ import spock.lang.Shared
import spock.lang.Specification
import spock.lang.Unroll
import org.springframework.boot.test.rule.OutputCapture
import org.springframework.boot.test.system.OutputCaptureRule
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import org.springframework.cloud.contract.verifier.config.TestFramework
@@ -36,7 +36,7 @@ import org.springframework.cloud.contract.verifier.util.SyntaxChecker
class XmlMethodBodyBuilderSpec extends Specification {
@Rule
OutputCapture capture = new OutputCapture()
OutputCaptureRule capture = new OutputCaptureRule()
@Shared
ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(

5
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/YamlMockMvcMethodBodyBuilderSpec.groovy
View File

@@ -16,14 +16,13 @@
package org.springframework.cloud.contract.verifier.builder
import org.junit.Rule
import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification
import spock.util.environment.RestoreSystemProperties
import org.springframework.boot.test.rule.OutputCapture
import org.springframework.boot.test.system.OutputCaptureRule
import org.springframework.cloud.contract.spec.Contract
import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties
import org.springframework.cloud.contract.verifier.config.TestFramework
@@ -40,7 +39,7 @@ import org.springframework.cloud.contract.verifier.util.SyntaxChecker
class YamlMockMvcMethodBodyBuilderSpec extends Specification implements WireMockStubVerifier {
@Rule
OutputCapture capture = new OutputCapture()
OutputCaptureRule capture = new OutputCaptureRule()
@Shared
ContractVerifierConfigProperties properties = new ContractVerifierConfigProperties(