Browse Source

and fix the array-based join method as well

master
Stefan Bodewig 9 years ago
parent
commit
eb4cd63850
2 changed files with 9 additions and 1 deletions
  1. +3
    -0
      src/main/org/apache/tools/ant/util/StringUtils.java
  2. +6
    -1
      src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java

+ 3
- 0
src/main/org/apache/tools/ant/util/StringUtils.java View File

@@ -297,6 +297,9 @@ public final class StringUtils {
* @return the joined string
*/
public static String join(Object[] array, CharSequence separator) {
if (array == null) {
return "";
}
return join(Arrays.asList(array), separator);
}



+ 6
- 1
src/tests/junit/org/apache/tools/ant/util/StringUtilsTest.java View File

@@ -182,10 +182,15 @@ public class StringUtilsTest {
}
@Test
public void testJoinNullArray() {
public void testJoinNullCollection() {
assertEquals("", StringUtils.join((Collection<String>)null, ", "));
}
@Test
public void testJoinNullArray() {
assertEquals("", StringUtils.join((String[])null, ", "));
}
@Test
public void testJoinNullSeparator() {
assertEquals("abc", StringUtils.join(Arrays.asList("a", "b", "c"), null));


Loading…
Cancel
Save