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

Fixes #176 - change also directory name

Browse Source
This commit is contained in:
Jakub Kubrynski
2015-11-23 22:54:31 +01:00
parent 88c9400868
commit 093b28b79d
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accurest-core/src/main/groovy/io/codearte/accurest/TestGenerator.groovy
View File

@@ -67,7 +67,7 @@ class TestGenerator {
def className = afterLast(includedDirectoryRelativePath, File.separator) + configProperties.targetFramework.classNameSuffix
def packageName = buildPackage(basePackageNameForClass, includedDirectoryRelativePath)
def classBytes = generator.buildClass(filesToClass, className, packageName).getBytes(StandardCharsets.UTF_8)
saver.saveClassFile(className, basePackageNameForClass, includedDirectoryRelativePath, classBytes)
saver.saveClassFile(className, basePackageNameForClass, convertIllegalPackageChars(includedDirectoryRelativePath), classBytes)
counter.incrementAndGet()
}
}
@@ -75,7 +75,7 @@ class TestGenerator {
private static String buildPackage(final String packageNameForClass, final String includedDirectoryRelativePath) {
String directory = beforeLast(includedDirectoryRelativePath, File.separator)
return !directory.empty ? "$packageNameForClass.${directoryToPackage(directory)}" : packageNameForClass
return !directory.empty ? "$packageNameForClass.${directoryToPackage(convertIllegalPackageChars(directory))}" : packageNameForClass
}
private static String normalizePath(String path) {

6
accurest-core/src/main/groovy/io/codearte/accurest/util/NamesUtil.groovy
View File

@@ -51,6 +51,10 @@ class NamesUtil {
}
static String directoryToPackage(String directory) {
return directory.replace(File.separator, '.').replace('-', '_')
return directory.replace(File.separator, '.')
}
static String convertIllegalPackageChars(String packageName) {
return packageName.replace('-', '_')
}
}

6
accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
View File

@@ -7,10 +7,10 @@ import spock.lang.Stepwise
@Stepwise
class BasicFunctionalSpec extends IntegrationSpec {
private static final String GENERATED_TEST = "build//generated-sources//accurest//accurest//PairIdSpec.groovy"
private static final String GENERATED_CLIENT_JSON_STUB = "build//production//bootSimple-stubs//repository//mappings//pairId//collerate_PlacesFrom_Tweet.json"
private static final String GENERATED_TEST = "build//generated-sources//accurest//accurest//twitter_places_analyzer//PairIdSpec.groovy"
private static final String GENERATED_CLIENT_JSON_STUB = "build//production//bootSimple-stubs//repository//mappings//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.json"
private static final String GROOVY_DSL_CONTRACT = "repository//mappings//com//ofg//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.groovy"
private static final String TEST_EXECUTION_XML_REPORT = "build/test-results/TEST-accurest.PairIdSpec.xml"
private static final String TEST_EXECUTION_XML_REPORT = "build/test-results/TEST-accurest.twitter_places_analyzer.PairIdSpec.xml"
void setup() {
copyResources("functionalTest/bootSimple", "")

2
accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
View File

@@ -8,7 +8,7 @@ apply plugin: 'groovy'
apply plugin: 'accurest'
ext {
contractsDir = file("${project.rootDir}/repository/mappings/com/ofg/twitter-places-analyzer")
contractsDir = file("${project.rootDir}/repository/mappings/com/ofg")
wireMockStubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/")
wireMockStubsOutputDir = new File(wireMockStubsOutputDirRoot, 'repository/mappings/')
}