Author: bayard Date: Wed Aug 30 11:22:12 2006 New Revision: 438574 URL: http://svn.apache.org/viewvc?rev=438574&view=rev Log: Fixed 2nd javadoc bug mentioned in #LANG-277 and added more unit tests to match the javadoc examples
Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java Modified: jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java?rev=438574&r1=438573&r2=438574&view=diff ============================================================================== --- jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java (original) +++ jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringUtils.java Wed Aug 30 11:22:12 2006 @@ -2233,7 +2233,7 @@ * StringUtils.splitPreserveAllTokens("a\tb\nc", null) = ["a", "b", "c"] * StringUtils.splitPreserveAllTokens("a b c", ' ') = ["a", "b", "c"] * StringUtils.splitPreserveAllTokens("a b c ", ' ') = ["a", "b", "c", ""] - * StringUtils.splitPreserveAllTokens("a b c ", ' ') = ["a", "b", "c", "", ""] + * StringUtils.splitPreserveAllTokens("a b c ", ' ') = ["a", "b", "c", "", ""] * StringUtils.splitPreserveAllTokens(" a b c", ' ') = ["", a", "b", "c"] * StringUtils.splitPreserveAllTokens(" a b c", ' ') = ["", "", a", "b", "c"] * StringUtils.splitPreserveAllTokens(" a b c ", ' ') = ["", a", "b", "c", ""] Modified: jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java?rev=438574&r1=438573&r2=438574&view=diff ============================================================================== --- jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java (original) +++ jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java Wed Aug 30 11:22:12 2006 @@ -449,8 +449,28 @@ assertEquals(null, StringUtils.splitPreserveAllTokens(null)); assertEquals(0, StringUtils.splitPreserveAllTokens("").length); - String str = "a b .c"; + String str = "abc def"; String[] res = StringUtils.splitPreserveAllTokens(str); + assertEquals(2, res.length); + assertEquals("abc", res[0]); + assertEquals("def", res[1]); + + str = "abc def"; + res = StringUtils.splitPreserveAllTokens(str); + assertEquals(3, res.length); + assertEquals("abc", res[0]); + assertEquals("", res[1]); + assertEquals("def", res[2]); + + str = " abc "; + res = StringUtils.splitPreserveAllTokens(str); + assertEquals(3, res.length); + assertEquals("", res[0]); + assertEquals("abc", res[1]); + assertEquals("", res[2]); + + str = "a b .c"; + res = StringUtils.splitPreserveAllTokens(str); assertEquals(3, res.length); assertEquals("a", res[0]); assertEquals("b", res[1]); @@ -581,6 +601,23 @@ assertEquals("a", res[2]); assertEquals("b", res[3]); assertEquals("c", res[4]); + + str = "a b c "; + res = StringUtils.splitPreserveAllTokens(str,' '); + assertEquals(4, res.length); + assertEquals("a", res[0]); + assertEquals("b", res[1]); + assertEquals("c", res[2]); + assertEquals("", res[3]); + + str = "a b c "; + res = StringUtils.splitPreserveAllTokens(str,' '); + assertEquals(5, res.length); + assertEquals("a", res[0]); + assertEquals("b", res[1]); + assertEquals("c", res[2]); + assertEquals("", res[3]); + assertEquals("", res[3]); // Match example in javadoc { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]