Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed filepaths again for UNIX build

Browse Source
This commit is contained in:
dsyer
2007-10-12 13:49:44 +00:00
parent db405df7a4
commit f6b0bfdb47
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
execution/src/main/java/org/springframework/batch/execution/facade/BatchResourceFactoryBean.java
View File

@@ -64,7 +64,7 @@ public class BatchResourceFactoryBean extends AbstractFactoryBean implements
private static final String STEP_NAME_PATTERN = "%STEP_NAME%";
private static final String DEFAULT_PATTERN = "%BATCH_ROOT%/data/%JOB_NAME%/"
private static final String DEFAULT_PATTERN = "/%BATCH_ROOT%/data/%JOB_NAME%/"
+ "%JOB_IDENTIFIER%-%STEP_NAME%.txt";
private String filePattern = DEFAULT_PATTERN;
@@ -137,6 +137,8 @@ public class BatchResourceFactoryBean extends AbstractFactoryBean implements
private String replacePattern(String string, String pattern,
String replacement) {
if (string==null) return null;
// check to ensure pattern exists in string.
if (string.indexOf(pattern) != -1) {
return StringUtils.replace(string, pattern, replacement);
@@ -168,11 +170,11 @@ public class BatchResourceFactoryBean extends AbstractFactoryBean implements
}
public void setFilePattern(String filePattern) {
this.filePattern = filePattern;
this.filePattern = replacePattern(filePattern, "\\", File.separator);
}
public void setRootDirectory(String rootDirectory) {
this.rootDirectory = rootDirectory;
this.rootDirectory = replacePattern(rootDirectory, "\\", File.separator);
if (rootDirectory != null && rootDirectory.endsWith(File.separator)) {
this.rootDirectory = rootDirectory.substring(0, rootDirectory
.lastIndexOf(File.separator));

15
execution/src/test/java/org/springframework/batch/execution/facade/BatchResourceFactoryBeanTests.java
View File

@@ -95,7 +95,7 @@ public class BatchResourceFactoryBeanTests extends TestCase {
* regular use with valid context and pattern provided
*/
public void testCreateFileName() throws Exception {
// doTestPathName("testJob-testStream-11-20070730-bar.txt", path);
doTestPathName("testJob-testStream-11-20070730-bar.txt", path);
}
public void testObjectType() throws Exception {
@@ -114,7 +114,7 @@ public class BatchResourceFactoryBeanTests extends TestCase {
}
public void testNonStandardFilePattern() throws Exception {
resourceFactory.setFilePattern("%BATCH_ROOT%/data/%JOB_NAME%/"
resourceFactory.setFilePattern("/%BATCH_ROOT%/data/%JOB_NAME%/"
+ "%STEP_NAME%+%JOB_IDENTIFIER%");
doTestPathName("bar+testJob-testStream-11-20070730", path);
}
@@ -141,10 +141,10 @@ public class BatchResourceFactoryBeanTests extends TestCase {
public void testRootDirectoryEndsWithBackSlash() throws Exception {
String rootDir = getRootDir();
rootDir = StringUtils.replace(rootDir, File.separator, "\\") + "\\";
rootDir = "/"+StringUtils.replace(rootDir, File.separator, "\\") + "\\";
resourceFactory.setRootDirectory(rootDir);
// TODO: this one fails on UNIX (so Bamboo)...
// doTestPathName("testJob-testStream-11-20070730-bar.txt");
doTestPathName("testJob-testStream-11-20070730-bar.txt", path);
}
private void doTestPathName(String filename, String path) throws Exception, IOException {
@@ -154,9 +154,10 @@ public class BatchResourceFactoryBeanTests extends TestCase {
String absolutePath = new File("/" + rootDir + pathsep + path + identifier.getName() + pathsep + filename).getAbsolutePath();
// System.err.println(absolutePath);
// System.err.println(returnedPath);
// assertEquals(absolutePath, returnedPath);
System.err.println(path);
System.err.println(absolutePath);
System.err.println(returnedPath);
assertEquals(absolutePath, returnedPath);
}
}