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

Merge pull request #34 from 4finance/bugfix/pathSeparatorOnWindows

Browse Source 
Fix file separators on windows.
This commit is contained in:
Marcin Zajączkowski
2015-02-25 12:21:04 +01:00
parent 2f0315af1e 38301d1dd9
commit f000a0e117
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accurest-converters/src/test/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverterSpec.groovy Normal file → Executable file
View File

@@ -11,8 +11,7 @@ import java.nio.file.Paths
class RecursiveFilesConverterSpec extends Specification {
private static
final Set<String> EXPECTED_TARGET_FILES = ["dslRoot.json", "dir1/dsl1.json", "dir1/dsl1b.json", "dir2/dsl2.json"]
private static final Set<Path> EXPECTED_TARGET_FILES = [Paths.get("dslRoot.json"), Paths.get("dir1/dsl1.json"), Paths.get("dir1/dsl1b.json"), Paths.get("dir2/dsl2.json")]
@Rule
public TemporaryFolder tmpFolder = new TemporaryFolder();
@@ -56,12 +55,11 @@ class RecursiveFilesConverterSpec extends Specification {
e.cause?.message == "Test conversion error"
}
private
static Set<String> getRelativePathsForFilesInDirectory(Collection<File> createdFiles, File targetRootDirectory) {
private static Set<Path> getRelativePathsForFilesInDirectory(Collection<File> createdFiles, File targetRootDirectory) {
Path rootSourcePath = Paths.get(targetRootDirectory.toURI())
Set<String> relativizedCreatedFiles = createdFiles.collect { File file ->
rootSourcePath.relativize(Paths.get(file.toURI())).toString()
Set<Path> relativizedCreatedFiles = createdFiles.collect { File file ->
rootSourcePath.relativize(Paths.get(file.toURI()))
}
relativizedCreatedFiles
return relativizedCreatedFiles
}
}

6
accurest-core/src/main/groovy/io/coderate/accurest/TestGenerator.groovy Normal file → Executable file
View File

@@ -56,7 +56,7 @@ class TestGenerator {
if (!includedDirectoryRelativePath.isEmpty()) {
List<File> filesToClass = directoryScanner.includedFiles.
grep { String includedFile ->
return includedFile.matches(includedDirectoryRelativePath + File.separator + "[A-Za-z0-9]*\\.groovy")
return normalizePath(includedFile).matches(normalizePath(includedDirectoryRelativePath + File.separator) + "[A-Za-z0-9]*\\.groovy")
}
.collect {
return new File(configProperties.contractsDslDir, it)
@@ -69,4 +69,8 @@ class TestGenerator {
}
}
}
private String normalizePath(String path) {
return path.replaceAll(/\\+/, '/')
}
}