diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/AccurestIntegrationSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/AccurestIntegrationSpec.groovy index f5b5ac98bb..19abff5588 100644 --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/AccurestIntegrationSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/AccurestIntegrationSpec.groovy @@ -35,17 +35,14 @@ abstract class AccurestIntegrationSpec extends Specification { protected void setupForProject(String projectRoot) { copyResourcesToRoot(projectRoot) - def pluginClasspathResource = getClass().classLoader.findResource("plugin-classpath.txt") if (pluginClasspathResource == null) { throw new IllegalStateException("Did not find 'plugin-classpath.txt'") } - String pluginClasspath = pluginClasspathResource.readLines() .collect { it.replace('\\', '\\\\') } // escape backslashes in Windows paths .collect { "'$it'" } .join(", ") - buildFile << """ buildscript { dependencies { @@ -53,7 +50,6 @@ abstract class AccurestIntegrationSpec extends Specification { } } """ - // Extending buildscript is required when 'apply' is used. // 'GradleRunner#withPluginClasspath' can be used when plugin is added using 'plugins { id...' } diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy index cb6839cba1..015825ccf1 100755 --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy @@ -21,7 +21,7 @@ class BasicFunctionalSpec extends AccurestIntegrationSpec { def "should pass basic flow"() { when: - BuildResult result = run("check") + BuildResult result = run("check", "publishToMavenLocal") then: result.task(":generateWireMockClientStubs").outcome == SUCCESS result.task(":generateAccurest").outcome == SUCCESS diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/MessagingProjectSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/MessagingProjectSpec.groovy index 502d3cfda2..0a57265380 100755 --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/MessagingProjectSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/MessagingProjectSpec.groovy @@ -14,7 +14,7 @@ class MessagingProjectSpec extends AccurestIntegrationSpec { given: assert fileExists('build.gradle') expect: - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } def "should pass basic flow for JUnit"() { @@ -23,7 +23,7 @@ class MessagingProjectSpec extends AccurestIntegrationSpec { assert fileExists('build.gradle') expect: switchToJunitTestFramework('io.codearte.accurest.samples.book.MessagingBaseSpec', 'io.codearte.accurest.samples.book.MessagingBaseTest') - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } } diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleJerseyProjectSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleJerseyProjectSpec.groovy index f1b429d627..fe970626ab 100755 --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleJerseyProjectSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleJerseyProjectSpec.groovy @@ -14,7 +14,7 @@ class SampleJerseyProjectSpec extends AccurestIntegrationSpec { given: assert fileExists('build.gradle') expect: - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } def "should pass basic flow for JUnit"() { @@ -22,7 +22,7 @@ class SampleJerseyProjectSpec extends AccurestIntegrationSpec { switchToJunitTestFramework() assert fileExists('build.gradle') expect: - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } } diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleProjectSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleProjectSpec.groovy index e27e948003..f14c277106 100755 --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleProjectSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/SampleProjectSpec.groovy @@ -14,7 +14,7 @@ class SampleProjectSpec extends AccurestIntegrationSpec { given: assert fileExists('build.gradle') expect: - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } def "should pass basic flow for JUnit"() { @@ -22,7 +22,7 @@ class SampleProjectSpec extends AccurestIntegrationSpec { switchToJunitTestFramework() assert fileExists('build.gradle') expect: - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } } diff --git a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/ScenarioProjectSpec.groovy b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/ScenarioProjectSpec.groovy index 260d82c1c9..ce4db6e798 100755 --- a/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/ScenarioProjectSpec.groovy +++ b/accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/ScenarioProjectSpec.groovy @@ -14,7 +14,7 @@ class ScenarioProjectSpec extends AccurestIntegrationSpec { given: assert fileExists('build.gradle') expect: - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } def "should pass basic flow for JUnit"() { @@ -22,7 +22,7 @@ class ScenarioProjectSpec extends AccurestIntegrationSpec { assert fileExists('build.gradle') expect: switchToJunitTestFramework() - runTasksSuccessfully('check') + runTasksSuccessfully('check', "publishToMavenLocal") } } diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle index 4db3e39f58..b20f2a69eb 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle @@ -8,11 +8,13 @@ apply plugin: 'groovy' apply plugin: 'accurest' apply plugin: 'maven-publish' +group = 'io.codearte.accurest.testprojects' + ext { - contractsDir = file("${project.rootDir}/repository/mappings/") + contractsDir = file("repository/mappings") stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") - wireMockStubsOutputDir = new File(stubsOutputDirRoot, 'repository/mappings/') - contractsOutputDir = new File(stubsOutputDirRoot, 'repository/accurest/') + wireMockStubsOutputDir = file(new File(stubsOutputDirRoot, 'repository/mappings/')) + contractsOutputDir = file(new File(stubsOutputDirRoot, 'repository/accurest/')) } configurations { @@ -71,11 +73,13 @@ wrapper { task copyContracts(type: Copy) { from contractsDir + include '**/*.groovy' into contractsOutputDir } task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs", copyContracts]) { - baseName = "${project.name}-stubs" + baseName = "${project.name}" + classifier = "stubs" from stubsOutputDirRoot } diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/messagingProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/messagingProject/build.gradle index f48bbe9c4f..cb15b57e01 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/messagingProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/messagingProject/build.gradle @@ -13,8 +13,10 @@ apply plugin: 'groovy' apply plugin: 'accurest' apply plugin: 'maven-publish' +group = 'io.codearte.accurest.testprojects' + ext { - contractsDir = file("${project.rootDir}/repository/mappings/") + contractsDir = file("repository/mappings") stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") wireMockStubsOutputDir = new File(stubsOutputDirRoot, 'repository/mappings/') contractsOutputDir = new File(stubsOutputDirRoot, 'repository/accurest/') @@ -84,11 +86,13 @@ wrapper { task copyContracts(type: Copy) { from contractsDir + include '**/*.groovy' into contractsOutputDir } task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs", copyContracts]) { - baseName = "${project.name}-stubs" + baseName = "${project.name}" + classifier = "stubs" from stubsOutputDirRoot } diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle index 7bcf25e20f..8cf1b6941e 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -8,6 +8,8 @@ buildscript { } } +group = 'io.codearte.accurest.testprojects' + ext { restAssuredVersion = '2.5.0' spockVersion = '1.0-groovy-2.4' @@ -38,10 +40,10 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') apply plugin: 'maven-publish' ext { - contractsDir = file("${project.rootDir}/repository/mappings/") + contractsDir = file("mappings") stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") - wireMockStubsOutputDir = new File(stubsOutputDirRoot, 'repository/mappings/') - contractsOutputDir = new File(stubsOutputDirRoot, 'repository/accurest/') + wireMockStubsOutputDir = file(new File(stubsOutputDirRoot, 'repository/mappings/')) + contractsOutputDir = file(new File(stubsOutputDirRoot, 'repository/accurest/')) } accurest { @@ -80,11 +82,13 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') task copyContracts(type: Copy) { from contractsDir + include '**/*.groovy' into contractsOutputDir } task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs", copyContracts]) { - baseName = "${project.name}-stubs" + baseName = "${project.name}" + classifier = "stubs" from stubsOutputDirRoot } diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle index 166d4dc91e..c2fb66a1f6 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle @@ -16,6 +16,8 @@ ext { accurestStubsBaseDirectory = 'src/test/resources/stubs' } +group = 'io.codearte.accurest.testprojects' + subprojects { apply plugin: 'groovy' @@ -38,10 +40,10 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') apply plugin: 'maven-publish' ext { - contractsDir = file("${project.rootDir}/repository/mappings/") + contractsDir = file("mappings") stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") - wireMockStubsOutputDir = new File(stubsOutputDirRoot, 'repository/mappings/') - contractsOutputDir = new File(stubsOutputDirRoot, 'repository/accurest/') + wireMockStubsOutputDir = file(new File(stubsOutputDirRoot, 'repository/mappings/')) + contractsOutputDir = file(new File(stubsOutputDirRoot, 'repository/accurest/')) } accurest { @@ -79,10 +81,12 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') task copyContracts(type: Copy) { from contractsDir into contractsOutputDir + includeEmptyDirs = true } task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs", copyContracts]) { - baseName = "${project.name}-stubs" + baseName = "${project.name}" + classifier = "stubs" from stubsOutputDirRoot } diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle index e5b1dfb4db..da7b0be424 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle @@ -16,6 +16,8 @@ ext { accurestStubsBaseDirectory = 'src/test/resources/stubs' } +group = 'io.codearte.accurest.testprojects' + subprojects { apply plugin: 'groovy' apply plugin: 'maven-publish' @@ -38,10 +40,10 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') apply plugin: 'accurest' ext { - contractsDir = file("${project.rootDir}/repository/mappings/") + contractsDir = file("mappings") stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") - wireMockStubsOutputDir = new File(stubsOutputDirRoot, 'repository/mappings/') - contractsOutputDir = new File(stubsOutputDirRoot, 'repository/accurest/') + wireMockStubsOutputDir = file(new File(stubsOutputDirRoot, 'repository/mappings/')) + contractsOutputDir = file(new File(stubsOutputDirRoot, 'repository/accurest/')) } accurest { @@ -80,11 +82,13 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') task copyContracts(type: Copy) { from contractsDir + include '**/*.groovy' into contractsOutputDir } task stubsJar(type: Jar, dependsOn: ["generateWireMockClientStubs", copyContracts]) { - baseName = "${project.name}-stubs" + baseName = "${project.name}" + classifier = "stubs" from stubsOutputDirRoot }