From ccdac2522cdc7ad8e134e355f3e0d1a2dfbe8d75 Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Fri, 30 Aug 2019 09:38:53 -0500 Subject: [PATCH] Remove ignored tests --- .../plugin/SampleJerseyProjectSpec.groovy | 61 ----------------- .../plugin/SampleProjectKotlinSpec.groovy | 67 ------------------- .../verifier/plugin/SampleProjectSpec.groovy | 67 ------------------- 3 files changed, 195 deletions(-) delete mode 100755 spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy delete mode 100644 spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectKotlinSpec.groovy delete mode 100755 spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectSpec.groovy diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy deleted file mode 100755 index c8f2785824..0000000000 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.contract.verifier.plugin - -import org.gradle.testkit.runner.BuildResult -import spock.lang.Stepwise -import spock.lang.Ignore - -@Stepwise -@Ignore("Flaky") -class SampleJerseyProjectSpec extends ContractVerifierIntegrationSpec { - - def setup() { - setupForProject("functionalTest/sampleJerseyProject") - runTasksSuccessfully('clean') - //delete accidental output when previously importing SimpleBoot into Idea to tweak it - } - - def "should pass basic flow for Spock"() { - given: - assert fileExists('build.gradle') - expect: - BuildResult result = runTasksSuccessfully(checkAndPublishToMavenLocal()) - jarContainsContractVerifierContracts('fraudDetectionService/build/libs') - !result.output.contains("You've switched off the stub publication") - } - - def "should pass basic flow for Spock with disabled publication"() { - given: - assert fileExists('build.gradle') - expect: - String[] args = (checkAndPublishToMavenLocal().toList() << "-PdisablePublication") as String[] - BuildResult result = runTasksSuccessfully(args) - !fileExists('fraudDetectionService/build/libs') - result.output.contains("You've switched off the stub publication") - } - - def "should pass basic flow for JUnit"() { - given: - switchToJunitTestFramework() - assert fileExists('build.gradle') - expect: - runTasksSuccessfully(checkAndPublishToMavenLocal()) - jarContainsContractVerifierContracts('fraudDetectionService/build/libs') - } - -} diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectKotlinSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectKotlinSpec.groovy deleted file mode 100644 index 16b1a8cb21..0000000000 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectKotlinSpec.groovy +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.contract.verifier.plugin - -import org.gradle.testkit.runner.BuildResult -import org.junit.Ignore -import spock.lang.Stepwise - -import static org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE - -@Stepwise -@Ignore -class SampleProjectKotlinSpec extends ContractVerifierKotlinIntegrationSpec { - - def setup() { - setupForProject("functionalTest/sampleProjectKotlin") - runTasksSuccessfully('clean') - //delete accidental output when previously importing SimpleBoot into Idea to tweak it - } - - def "should pass basic flow for Spock"() { - given: - assert fileExists('build.gradle.kts') - when: - String[] args = ["check", "publishToMavenLocal", "--debug"] as String[] - if (WORK_OFFLINE) { - args << "--offline" - } - runTasksSuccessfully(args) - then: - jarContainsContractVerifierContracts('fraudDetectionService/build/libs') - when: "running generation without change inputs" - BuildResult secondExecutionResult = runTasksSuccessfully() - then: "tasks should be up-to-date" - validateTasksOutcome(secondExecutionResult, UP_TO_DATE, 'generateClientStubs', 'generateContractTests', 'copyContracts') - - } - - def "should pass basic flow for JUnit"() { - given: - switchToJunitTestFramework() - assert fileExists('build.gradle.kts') - when: - runTasksSuccessfully(checkAndPublishToMavenLocal()) - then: - jarContainsContractVerifierContracts('fraudDetectionService/build/libs') - when: "running generation without change inputs" - BuildResult secondExecutionResult = runTasksSuccessfully() - then: "tasks should be up-to-date" - validateTasksOutcome(secondExecutionResult, UP_TO_DATE, 'generateClientStubs', 'generateContractTests', 'copyContracts') - } - -} diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectSpec.groovy deleted file mode 100755 index dae3cb595f..0000000000 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleProjectSpec.groovy +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.contract.verifier.plugin - -import org.gradle.testkit.runner.BuildResult -import org.junit.Ignore -import spock.lang.Stepwise - -import static org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE - -@Stepwise -@Ignore -class SampleProjectSpec extends ContractVerifierIntegrationSpec { - - def setup() { - setupForProject("functionalTest/sampleProject") - runTasksSuccessfully('clean') - //delete accidental output when previously importing SimpleBoot into Idea to tweak it - } - - def "should pass basic flow for Spock"() { - given: - assert fileExists('build.gradle') - when: - String[] args = ["check", "publishToMavenLocal", "--debug"] as String[] - if (WORK_OFFLINE) { - args << "--offline" - } - runTasksSuccessfully(args) - then: - jarContainsContractVerifierContracts('fraudDetectionService/build/libs') - when: "running generation without change inputs" - BuildResult secondExecutionResult = runTasksSuccessfully() - then: "tasks should be up-to-date" - validateTasksOutcome(secondExecutionResult, UP_TO_DATE, 'generateClientStubs', 'generateContractTests', 'copyContracts') - - } - - def "should pass basic flow for JUnit"() { - given: - switchToJunitTestFramework() - assert fileExists('build.gradle') - when: - runTasksSuccessfully(checkAndPublishToMavenLocal()) - then: - jarContainsContractVerifierContracts('fraudDetectionService/build/libs') - when: "running generation without change inputs" - BuildResult secondExecutionResult = runTasksSuccessfully() - then: "tasks should be up-to-date" - validateTasksOutcome(secondExecutionResult, UP_TO_DATE, 'generateClientStubs', 'generateContractTests', 'copyContracts') - } - -}