Repository: wicket Updated Branches: refs/heads/wicket-6.x 2ab12e952 -> 9bd9d3679
WICKET-5720 Method Strings.join doesn't work correctly if separator is empty. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9bd9d367 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9bd9d367 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9bd9d367 Branch: refs/heads/wicket-6.x Commit: 9bd9d3679d90ed0192f4127373d34f7c43faa660 Parents: 2ab12e9 Author: adelbene <[email protected]> Authored: Sun Oct 5 15:48:28 2014 +0200 Committer: adelbene <[email protected]> Committed: Sun Oct 5 15:51:01 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/util/string/Strings.java | 2 +- .../org/apache/wicket/util/string/StringsTest.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9bd9d367/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java index da7b532..2db74b6 100755 --- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java @@ -677,7 +677,7 @@ public final class Strings { boolean lhsClosed = fragments[i - 1].endsWith(separator); boolean rhsClosed = fragment.startsWith(separator); - if (lhsClosed && rhsClosed) + if (!Strings.isEmpty(separator) && lhsClosed && rhsClosed) { buff.append(fragment.substring(1)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/9bd9d367/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java index 182b476..b0e3970 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringsTest.java @@ -17,6 +17,8 @@ package org.apache.wicket.util.string; import java.io.UnsupportedEncodingException; +import java.util.Arrays; +import java.util.List; import org.apache.wicket.util.lang.Args; import org.junit.Assert; @@ -553,7 +555,20 @@ public class StringsTest extends Assert assertTrue(exceptionString.length() > 1); assertTrue(exceptionString.contains("RuntimeException")); } - + + /** + * Tests the <code>join</code> method. + */ + @Test + public void testJoin() throws Exception + { + List<String> fragments = Arrays.asList("foo", "bar", "baz"); + + assertEquals("foo-bar-baz", Strings.join("-", fragments)); + + //empty separator + assertEquals("foobarbaz", Strings.join("", fragments)); + } /** * Asserts that both string arrays are equal. *
