From f849dc40c95fb190e0c5ee87ee89c7bd5933dc90 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Wed, 22 Jan 2020 17:20:59 -0500 Subject: [PATCH] Replaces deprecations --- .../provider/wiremock/WireMockHttpServerStubSpec.groovy | 4 ++-- .../contract/stubrunner/ContractProjectUpdaterTest.java | 4 ++-- .../contract/verifier/builder/MethodBodyBuilderSpec.groovy | 5 ++--- .../builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy | 4 ++-- .../verifier/builder/SpringTestMethodBodyBuildersSpec.groovy | 5 +++-- .../verifier/builder/XmlMethodBodyBuilderSpec.groovy | 4 ++-- .../verifier/builder/YamlMockMvcMethodBodyBuilderSpec.groovy | 5 ++--- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy index d767041030..029fbe5be6 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/provider/wiremock/WireMockHttpServerStubSpec.groovy @@ -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: diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ContractProjectUpdaterTest.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ContractProjectUpdaterTest.java index 8d2c49391e..dfc10fd527 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ContractProjectUpdaterTest.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/ContractProjectUpdaterTest.java @@ -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; diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy index 7f67b9f2f3..db3c764013 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MethodBodyBuilderSpec.groovy @@ -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( diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy index d04d447ab9..8ca93b8265 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MockMvcMethodBodyBuilderWithMatchersSpec.groovy @@ -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( diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy index bf77071910..94a003bcae 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy @@ -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( diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/XmlMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/XmlMethodBodyBuilderSpec.groovy index bfb46cfc0f..73f9d83874 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/XmlMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/XmlMethodBodyBuilderSpec.groovy @@ -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( diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/YamlMockMvcMethodBodyBuilderSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/YamlMockMvcMethodBodyBuilderSpec.groovy index dde39d47c8..dea3f29f5a 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/YamlMockMvcMethodBodyBuilderSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/YamlMockMvcMethodBodyBuilderSpec.groovy @@ -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(