public List<String> getSourceDirs() {
String sources = properties.getProperty(SOURCE_DIRS_PROPERTY, "");
- return Arrays.asList(StringUtils.split(sources, SEPARATOR));
+ return trim(StringUtils.split(sources, SEPARATOR));
}
/**
public List<String> getSourceFiles() {
String sources = properties.getProperty(SOURCE_FILES_PROPERTY, "");
- return Arrays.asList(StringUtils.split(sources, SEPARATOR));
+ return trim(StringUtils.split(sources, SEPARATOR));
}
public List<String> getTestDirs() {
String sources = properties.getProperty(TEST_DIRS_PROPERTY, "");
- return Arrays.asList(StringUtils.split(sources, SEPARATOR));
+ return trim(StringUtils.split(sources, SEPARATOR));
}
/**
public List<String> getTestFiles() {
String sources = properties.getProperty(TEST_FILES_PROPERTY, "");
- return Arrays.asList(StringUtils.split(sources, SEPARATOR));
+ return trim(StringUtils.split(sources, SEPARATOR));
}
public List<String> getBinaries() {
String sources = properties.getProperty(BINARIES_PROPERTY, "");
- return Arrays.asList(StringUtils.split(sources, SEPARATOR));
+ return trim(StringUtils.split(sources, SEPARATOR));
}
/**
public List<String> getLibraries() {
String sources = properties.getProperty(LIBRARIES_PROPERTY, "");
- return Arrays.asList(StringUtils.split(sources, SEPARATOR));
+ return trim(StringUtils.split(sources, SEPARATOR));
}
/**
public List<ProjectDefinition> getSubProjects() {
return subProjects;
}
+
+ private static List<String> trim(String[] strings) {
+ List<String> result = Lists.newArrayList();
+ for (String s : strings) {
+ result.add(StringUtils.trim(s));
+ }
+ return result;
+ }
}
assertThat(def.getLibraries().size(), is(0));
}
+ /**
+ * See SONAR-2879
+ */
+ @Test
+ public void shouldTrimPaths() {
+ ProjectDefinition def = ProjectDefinition.create();
+ def.setProperty(ProjectDefinition.SOURCE_DIRS_PROPERTY, "src1, src2 , with whitespace");
+ def.setProperty(ProjectDefinition.TEST_DIRS_PROPERTY, "test1, test2 , with whitespace");
+ def.setProperty(ProjectDefinition.BINARIES_PROPERTY, "bin1, bin2 , with whitespace");
+ def.setProperty(ProjectDefinition.LIBRARIES_PROPERTY, "lib1, lib2 , with whitespace");
+
+ assertFiles(def.getSourceDirs(), "src1", "src2", "with whitespace");
+ assertFiles(def.getTestDirs(), "test1", "test2", "with whitespace");
+ assertFiles(def.getBinaries(), "bin1", "bin2", "with whitespace");
+ assertFiles(def.getLibraries(), "lib1", "lib2", "with whitespace");
+ }
+
@Test
public void shouldAddDirectoriesAsPath() {
ProjectDefinition def = ProjectDefinition.create();
assertFiles(def.getSourceFiles(), "src/main/java/foo/Bar.java", "src/main/java/hello/World.java");
assertFiles(def.getTestFiles(), "src/test/java/foo/BarTest.java", "src/test/java/hello/WorldTest.java");
-
}
@Test