|
@@ -30,7 +30,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
|
|
|
|
|
|
def "yamlRestTestVxCompatTest does nothing when there are no tests"() {
|
|
|
given:
|
|
|
- addSubProject(":distribution:bwc:bugfix") << """
|
|
|
+ addSubProject(":distribution:bwc:staged") << """
|
|
|
configurations { checkout }
|
|
|
artifacts {
|
|
|
checkout(new File(projectDir, "checkoutDir"))
|
|
@@ -53,11 +53,11 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
|
|
|
result.task(transformTask).outcome == TaskOutcome.NO_SOURCE
|
|
|
}
|
|
|
|
|
|
- def "yamlRestTestVxCompatTest executes and copies api and transforms tests from :bwc:bugfix"() {
|
|
|
+ def "yamlRestTestVxCompatTest executes and copies api and transforms tests from :bwc:staged"() {
|
|
|
given:
|
|
|
internalBuild()
|
|
|
|
|
|
- addSubProject(":distribution:bwc:bugfix") << """
|
|
|
+ addSubProject(":distribution:bwc:staged") << """
|
|
|
configurations { checkout }
|
|
|
artifacts {
|
|
|
checkout(new File(projectDir, "checkoutDir"))
|
|
@@ -90,8 +90,8 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
|
|
|
String api = "foo.json"
|
|
|
String test = "10_basic.yml"
|
|
|
//add the compatible test and api files, these are the prior version's normal yaml rest tests
|
|
|
- file("distribution/bwc/bugfix/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
|
|
|
- file("distribution/bwc/bugfix/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
|
|
|
+ file("distribution/bwc/staged/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
|
|
|
+ file("distribution/bwc/staged/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
|
|
|
|
|
|
when:
|
|
|
def result = gradleRunner("yamlRestTestV${compatibleVersion}CompatTest").build()
|
|
@@ -136,7 +136,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
|
|
|
def "yamlRestTestVxCompatTest is wired into check and checkRestCompat"() {
|
|
|
given:
|
|
|
|
|
|
- addSubProject(":distribution:bwc:bugfix") << """
|
|
|
+ addSubProject(":distribution:bwc:staged") << """
|
|
|
configurations { checkout }
|
|
|
artifacts {
|
|
|
checkout(new File(projectDir, "checkoutDir"))
|
|
@@ -180,7 +180,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
|
|
|
given:
|
|
|
internalBuild()
|
|
|
|
|
|
- addSubProject(":distribution:bwc:bugfix") << """
|
|
|
+ addSubProject(":distribution:bwc:staged") << """
|
|
|
configurations { checkout }
|
|
|
artifacts {
|
|
|
checkout(new File(projectDir, "checkoutDir"))
|
|
@@ -224,7 +224,7 @@ class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
|
|
|
|
|
|
setupRestResources([], [])
|
|
|
|
|
|
- file("distribution/bwc/bugfix/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
|
|
|
+ file("distribution/bwc/staged/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
|
|
|
"one":
|
|
|
- do:
|
|
|
do_.some.key_to_replace:
|