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

Renamed directories properties in plugin configuration

Browse Source
This commit is contained in:
Jakub Kubrynski
2015-02-21 21:09:44 +01:00
parent dd4635fe95
commit 40a9534d74
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy
View File

@@ -26,14 +26,14 @@ class TestGenerator {
TestGenerator(AccurestConfigProperties configProperties, SingleTestGenerator generator, FileSaver saver) {
this.configProperties = configProperties
if (configProperties.stubsBaseDirectory == null) {
throw new AccurestException("Stubs directory not found under " + configProperties.stubsBaseDirectory)
if (configProperties.contractsDslDir == null) {
throw new AccurestException("Stubs directory not found under " + configProperties.contractsDslDir)
}
this.generator = generator
this.saver = saver
this.directoryScanner = new DirectoryScanner()
directoryScanner.setExcludes(configProperties.getIgnoredFiles() as String[])
directoryScanner.setBasedir(configProperties.stubsBaseDirectory)
directoryScanner.setBasedir(configProperties.contractsDslDir)
}
int generate() {
@@ -59,7 +59,7 @@ class TestGenerator {
return includedFile.matches(includedDirectoryRelativePath + File.separator + "[A-Za-z0-9]*\\.groovy")
}
.collect {
return new File(configProperties.stubsBaseDirectory, it)
return new File(configProperties.contractsDslDir, it)
}
if (filesToClass.size()) {
def className = afterLast(includedDirectoryRelativePath, File.separator)

7
accurest-core/src/main/groovy/io/coderate/accurest/config/AccurestConfigProperties.groovy
View File

@@ -6,14 +6,13 @@ package io.coderate.accurest.config
class AccurestConfigProperties {
TestFramework targetFramework = TestFramework.SPOCK
TestMode testMode = TestMode.MOCKMVC
File stubsBaseDirectory
String basePackageForTests
String baseClassForTests
String ruleClassForTests
List<String> ignoredFiles = []
File generatedTestSourcesDir
String[] imports = []
String[] staticImports = []
File groovyDslDir
File generatedWiremockClientStubsDir
File contractsDslDir
File generatedTestSourcesDir
File stubsOutputDir
}

2
accurest-core/src/test/groovy/io/codearte/accurest/MainTest.groovy
View File

@@ -8,7 +8,7 @@ import io.coderate.accurest.config.TestMode
class MainTest {
public static void main(String[] args) {
AccurestConfigProperties properties = new AccurestConfigProperties(
stubsBaseDirectory: new File('/home/devel/projects/codearte/accurest/accurest-core/src/test/resources/dsl'),
contractsDslDir: new File('/home/devel/projects/codearte/accurest/accurest-core/src/test/resources/dsl'),
generatedTestSourcesDir: new File('/tmp/accurest'),
targetFramework: TestFramework.SPOCK, testMode: TestMode.MOCKMVC, basePackageForTests: 'io.test',
staticImports: ['com.pupablada.Test.*'], imports: ['org.innapypa.Test'], ignoredFiles: ["**/other"])

7
accurest-core/src/test/groovy/io/codearte/accurest/TestGeneratorSpec.groovy
View File

@@ -4,7 +4,6 @@ import io.coderate.accurest.FileSaver
import io.coderate.accurest.SingleTestGenerator
import io.coderate.accurest.TestGenerator
import io.coderate.accurest.config.AccurestConfigProperties
import spock.lang.Ignore
import spock.lang.Specification
class TestGeneratorSpec extends Specification {
@@ -15,7 +14,7 @@ class TestGeneratorSpec extends Specification {
given:
File resource = new File(this.getClass().getResource("/directory/with/stubs/stubsRepositoryIndicator").toURI())
AccurestConfigProperties properties = new AccurestConfigProperties()
properties.stubsBaseDirectory = resource.parentFile
properties.contractsDslDir = resource.parentFile
TestGenerator testGenerator = new TestGenerator(properties, classGenerator, Stub(FileSaver))
when:
testGenerator.generateTestClasses("com.ofg")
@@ -28,7 +27,7 @@ class TestGeneratorSpec extends Specification {
File resource = new File(this.getClass().getResource("/directory/with/stubs/stubsRepositoryIndicator").toURI())
AccurestConfigProperties properties = new AccurestConfigProperties()
properties.ignoredFiles << "**/other/**"
properties.stubsBaseDirectory = resource.parentFile
properties.contractsDslDir = resource.parentFile
TestGenerator testGenerator = new TestGenerator(properties, classGenerator, Stub(FileSaver))
when:
testGenerator.generateTestClasses("com.ofg")
@@ -41,7 +40,7 @@ class TestGeneratorSpec extends Specification {
File resource = new File(this.getClass().getResource("/directory/with/stubs/stubsRepositoryIndicator").toURI())
AccurestConfigProperties properties = new AccurestConfigProperties()
properties.ignoredFiles << "**/other.groovy"
properties.stubsBaseDirectory = resource.parentFile
properties.contractsDslDir = resource.parentFile
TestGenerator testGenerator = new TestGenerator(properties, classGenerator, Stub(FileSaver))
classGenerator.buildClass(_, _, _) >> "sample"
when:

6
accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy
View File

@@ -43,7 +43,7 @@ class AccurestGradlePlugin implements Plugin<Project> {
void setConfigurationDefaults(AccurestConfigProperties extension) {
extension.with {
generatedTestSourcesDir = project.file("${project.buildDir}/generated-sources/accurest")
stubsBaseDirectory = project.file("${project.rootDir}/src/test/resources/stubs") //TODO: Use sourceset
contractsDslDir = project.file("${project.rootDir}/src/test/resources/stubs") //TODO: Use sourceset
basePackageForTests = 'io.codearte.accurest.tests'
}
}
@@ -61,8 +61,8 @@ class AccurestGradlePlugin implements Plugin<Project> {
Task task = project.tasks.create(DSL_TO_WIREMOCK_CLIENT_TASK_NAME, GenerateWiremockClientStubsFromDslTask)
task.description = "Generate Wiremock client stubs from GroovyDSL"
task.conventionMapping.with {
groovyDslDir = { extension.groovyDslDir }
generatedWiremockClientStubsDir = { extension.generatedWiremockClientStubsDir }
groovyDslDir = { extension.contractsDslDir }
generatedWiremockClientStubsDir = { extension.stubsOutputDir }
}
}
}