Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Null handling in StringUtils to handle nulls quietly 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137443 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-07-16 23:45:39 +00:00
parent 2a94c6d2e5
commit 7b88508ce9
3 changed files with 485 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

558
src/java/org/apache/commons/lang/StringUtils.java
View File

File diff suppressed because it is too large Load Diff

17
src/test/org/apache/commons/lang/StringUtilsSubstringTest.java
View File

@ -63,7 +63,7 @@ import junit.textui.TestRunner;
* *
* @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a> * @author <a href="mailto:scolebourne@joda.org">Stephen Colebourne</a>
* @author <a href="mailto:ridesmet@users.sourceforge.net">Ringo De Smet</a> * @author <a href="mailto:ridesmet@users.sourceforge.net">Ringo De Smet</a>
* @version $Id: StringUtilsSubstringTest.java,v 1.3 2003/03/23 21:51:19 scolebourne Exp $ * @version $Id: StringUtilsSubstringTest.java,v 1.4 2003/07/16 23:45:39 scolebourne Exp $
*/ */
public class StringUtilsSubstringTest extends TestCase { public class StringUtilsSubstringTest extends TestCase {
private static final String FOO = "foo"; private static final String FOO = "foo";
@ -192,17 +192,12 @@ public class StringUtilsSubstringTest extends TestCase {
} }
public void testCountMatches() { public void testCountMatches() {
try { assertEquals(0, StringUtils.countMatches(null, null));
assertEquals(-1, assertEquals(0, StringUtils.countMatches("blah", null));
StringUtils.countMatches(null, null)); assertEquals(0, StringUtils.countMatches(null, "DD"));
throw new RuntimeException("Should have thrown a NullPointerException. ");
} catch(NullPointerException npe) {
}
assertEquals(0, assertEquals(0, StringUtils.countMatches("x", ""));
StringUtils.countMatches("x", "") ); assertEquals(0, StringUtils.countMatches("", ""));
assertEquals(0,
StringUtils.countMatches("", "") );
assertEquals(3, assertEquals(3,
StringUtils.countMatches("one long someone sentence of one", "one")); StringUtils.countMatches("one long someone sentence of one", "one"));

152
src/test/org/apache/commons/lang/StringUtilsTest.java
View File

@ -54,6 +54,7 @@
package org.apache.commons.lang; package org.apache.commons.lang;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -69,7 +70,7 @@ import junit.textui.TestRunner;
* @author <a href="mailto:fredrik@westermarck.com>Fredrik Westermarck</a> * @author <a href="mailto:fredrik@westermarck.com>Fredrik Westermarck</a>
* @author Holger Krauth * @author Holger Krauth
* @author <a href="hps@intermeta.de">Henning P. Schmiedehausen</a> * @author <a href="hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id: StringUtilsTest.java,v 1.23 2003/07/16 21:23:50 scolebourne Exp $ * @version $Id: StringUtilsTest.java,v 1.24 2003/07/16 23:45:39 scolebourne Exp $
*/ */
public class StringUtilsTest extends TestCase { public class StringUtilsTest extends TestCase {
@ -153,6 +154,12 @@ public class StringUtilsTest extends TestCase {
} }
public void testJoin() { public void testJoin() {
assertEquals(null, StringUtils.concatenate(null));
assertEquals(null, StringUtils.join((Object[]) null, null));
assertEquals(null, StringUtils.join((Object[]) null, ','));
assertEquals(null, StringUtils.join((Iterator) null, null));
assertEquals(null, StringUtils.join((Iterator) null, ','));
assertEquals("concatenate(Object[]) failed", assertEquals("concatenate(Object[]) failed",
TEXT_LIST_NOSEP, StringUtils.concatenate(ARRAY_LIST)); TEXT_LIST_NOSEP, StringUtils.concatenate(ARRAY_LIST));
assertEquals("join(Object[], String) failed", TEXT_LIST, assertEquals("join(Object[], String) failed", TEXT_LIST,
@ -256,6 +263,19 @@ public class StringUtilsTest extends TestCase {
public void testOverlayString() { public void testOverlayString() {
assertEquals("overlayString(String, String, int, int) failed", assertEquals("overlayString(String, String, int, int) failed",
"foo foor baz", StringUtils.overlayString(SENTENCE, FOO, 4, 6) ); "foo foor baz", StringUtils.overlayString(SENTENCE, FOO, 4, 6) );
assertEquals(null, StringUtils.overlayString(null, null, 2, 4));
assertEquals("abef", StringUtils.overlayString("abcdef", null, 2, 4));
assertEquals("abef", StringUtils.overlayString("abcdef", "", 2, 4));
assertEquals("abzzzzef", StringUtils.overlayString("abcdef", "zzzz", 2, 4));
assertEquals("abcdzzzzcdef", StringUtils.overlayString("abcdef", "zzzz", 4, 2));
try {
StringUtils.overlayString("abcdef", "zzzz", -1, 4);
fail();
} catch (IndexOutOfBoundsException ex) {}
try {
StringUtils.overlayString("abcdef", "zzzz", 2, 8);
fail();
} catch (IndexOutOfBoundsException ex) {}
} }
public void testRepeat() { public void testRepeat() {
@ -272,8 +292,30 @@ public class StringUtilsTest extends TestCase {
} }
public void testCenter() { public void testCenter() {
assertEquals("center(String, int) failed", assertEquals(null, StringUtils.center(null, -1));
" "+FOO+" ", StringUtils.center(FOO, 9) ); assertEquals(null, StringUtils.center(null, 4));
assertEquals(" ", StringUtils.center("", 4));
assertEquals(" ab ", StringUtils.center("ab", 4));
assertEquals("abcd", StringUtils.center("abcd", 2));
assertEquals(" a ", StringUtils.center("a", 4));
assertEquals(null, StringUtils.center(null, -1, " "));
assertEquals(null, StringUtils.center(null, 4, " "));
assertEquals(" ", StringUtils.center("", 4, " "));
assertEquals(" ab ", StringUtils.center("ab", 4, " "));
assertEquals("abcd", StringUtils.center("abcd", 2, " "));
assertEquals(" a ", StringUtils.center("a", 4, " "));
assertEquals("yayz", StringUtils.center("a", 4, "yz"));
try {
StringUtils.center("abc", 4, null);
fail();
} catch (IllegalArgumentException ex) {
}
try {
StringUtils.center("abc", 4, "");
fail();
} catch (IllegalArgumentException ex) {
}
} }
public void testDeprecatedChompFunctions() { public void testDeprecatedChompFunctions() {
@ -304,6 +346,9 @@ public class StringUtilsTest extends TestCase {
{ "\n", "" }, { "\n", "" },
{ "\r", "" }, { "\r", "" },
{ "\r\n", "" }, { "\r\n", "" },
{ null, null },
{ "", "" },
{ "a", "" },
}; };
for (int i = 0; i < chopCases.length; i++) { for (int i = 0; i < chopCases.length; i++) {
String original = chopCases[i][0]; String original = chopCases[i][0];
@ -370,6 +415,9 @@ public class StringUtilsTest extends TestCase {
{"foo\nbar", "foo"}, {"foo\nbar", "foo"},
{"foo\nbar\n", "foo\nbar"}, {"foo\nbar\n", "foo\nbar"},
{"foo\nbar\nbaz", "foo\nbar"}, {"foo\nbar\nbaz", "foo\nbar"},
{null, null},
{"", ""},
{"foo", "foo"},
}; };
for (int i = 0; i < sliceCases.length; i++) { for (int i = 0; i < sliceCases.length; i++) {
String original = sliceCases[i][0]; String original = sliceCases[i][0];
@ -381,47 +429,66 @@ public class StringUtilsTest extends TestCase {
String original = "fooXXbarXXbaz"; String original = "fooXXbarXXbaz";
String sep = "XX"; String sep = "XX";
assertEquals("slice(String,String) failed", assertEquals("fooXXbar", StringUtils.slice(original, sep) );
"fooXXbar", StringUtils.slice(original, sep) ); assertEquals(null, StringUtils.slice(null, sep) );
assertEquals(null, StringUtils.slice(null, null) );
assertEquals("foo", StringUtils.slice("foo", null) );
assertEquals("foo", StringUtils.slice("foo", "b") );
assertEquals("fo", StringUtils.slice("foo", "o") );
assertEquals("sliceRemainder(String, String) failed", assertEquals("baz", StringUtils.sliceRemainder(original, sep) );
"baz", StringUtils.sliceRemainder(original, sep) ); assertEquals(null, StringUtils.sliceRemainder(null, sep) );
assertEquals(null, StringUtils.sliceRemainder(null, null) );
assertEquals("", StringUtils.sliceRemainder("foo", null) );
assertEquals("", StringUtils.sliceRemainder("foo", "b") );
assertEquals("t", StringUtils.sliceRemainder("foot", "o") );
assertEquals("sliceFirst(String, String) failed", assertEquals("foo", StringUtils.sliceFirst(original, sep) );
"foo", StringUtils.sliceFirst(original, sep) );
assertEquals("sliceFirstRemainder(String, String) failed", assertEquals("barXXbaz", StringUtils.sliceFirstRemainder(original, sep) );
"barXXbaz", StringUtils.sliceFirstRemainder(original, sep) );
} }
public void testPadFunctions() { public void testPadFunctions() {
assertEquals("rightPad(String, int) failed", assertEquals(null, StringUtils.rightPad (null, 8) );
"1234 ", StringUtils.rightPad ("1234", 8) ); assertEquals("1234 ", StringUtils.rightPad ("1234", 8) );
assertEquals("rightPad(String, int, String) failed", assertEquals(null, StringUtils.rightPad (null, 8, "-+") );
"1234-+-+", StringUtils.rightPad ("1234", 8, "-+") ); assertEquals("1234-+-+", StringUtils.rightPad ("1234", 8, "-+") );
assertEquals("123456-+~", StringUtils.rightPad ("123456", 9, "-+~") );
assertEquals("rightPad(String, int, String) failed", assertEquals("123456-+", StringUtils.rightPad ("123456", 8, "-+~") );
"123456-+~", StringUtils.rightPad ("123456", 9, "-+~") ); try {
StringUtils.rightPad("123456", 6, null);
assertEquals("leftPad(String, int) failed", fail();
" 1234", StringUtils.leftPad("1234", 8) ); } catch (IllegalArgumentException ex) {}
try {
assertEquals("leftPad(String, int, String) failed", StringUtils.rightPad("123456", 6, "");
"-+-+1234", StringUtils.leftPad("1234", 8, "-+") ); fail();
} catch (IllegalArgumentException ex) {}
assertEquals("leftPad(String, int, String) failed",
"-+~123456", StringUtils.leftPad("123456", 9, "-+~") ); assertEquals(null, StringUtils.leftPad (null, 8) );
assertEquals(" 1234", StringUtils.leftPad("1234", 8) );
assertEquals(null, StringUtils.leftPad (null, 8, "-+") );
assertEquals("-+-+1234", StringUtils.leftPad("1234", 8, "-+") );
assertEquals("-+~123456", StringUtils.leftPad("123456", 9, "-+~") );
assertEquals("-+123456", StringUtils.leftPad("123456", 8, "-+~") );
try {
StringUtils.leftPad("123456", 6, null);
fail();
} catch (IllegalArgumentException ex) {}
try {
StringUtils.leftPad("123456", 6, "");
fail();
} catch (IllegalArgumentException ex) {}
} }
public void testReverseFunctions() { public void testReverseFunctions() {
assertEquals("reverse(String) failed", assertEquals("sdrawkcab", StringUtils.reverse("backwards") );
"sdrawkcab", StringUtils.reverse("backwards") ); assertEquals("", StringUtils.reverse("") );
assertEquals("reverse(empty-string) failed", assertEquals(null, StringUtils.reverse(null) );
"", StringUtils.reverse("") );
assertEquals("reverseDelimitedString(String,'.') failed", assertEquals("org.apache.test",
"org.apache.test",
StringUtils.reverseDelimitedString("test.apache.org", ".") ); StringUtils.reverseDelimitedString("test.apache.org", ".") );
assertEquals("reverseDelimitedString(empty-string,'.') failed", assertEquals("reverseDelimitedString(empty-string,'.') failed",
"", "",
@ -624,8 +691,8 @@ public class StringUtilsTest extends TestCase {
assertEquals("indexOfAnyBut(String3, chars3)", -1, StringUtils.indexOfAnyBut(str3, chars3)); assertEquals("indexOfAnyBut(String3, chars3)", -1, StringUtils.indexOfAnyBut(str3, chars3));
} }
public void testAbbreviate() public void testAbbreviate() {
{ assertEquals(null, StringUtils.abbreviate(null, 10));
assertEquals("abbreviate(String,int) failed", assertEquals("abbreviate(String,int) failed",
"short", StringUtils.abbreviate("short", 10)); "short", StringUtils.abbreviate("short", 10));
assertEquals("abbreviate(String,int) failed", assertEquals("abbreviate(String,int) failed",
@ -642,6 +709,7 @@ public class StringUtilsTest extends TestCase {
assertEquals("abbreviate(String,int,int) failed", assertEquals("abbreviate(String,int,int) failed",
"raspberry peach", StringUtils.abbreviate(raspberry, 11, 15)); "raspberry peach", StringUtils.abbreviate(raspberry, 11, 15));
assertEquals(null, StringUtils.abbreviate(null, 7, 14));
assertAbbreviateWithOffset("abcdefg...", -1, 10); assertAbbreviateWithOffset("abcdefg...", -1, 10);
assertAbbreviateWithOffset("abcdefg...", 0, 10); assertAbbreviateWithOffset("abcdefg...", 0, 10);
assertAbbreviateWithOffset("abcdefg...", 1, 10); assertAbbreviateWithOffset("abcdefg...", 1, 10);
@ -679,15 +747,19 @@ public class StringUtilsTest extends TestCase {
assertEquals(message, expected, actual); assertEquals(message, expected, actual);
} }
public void testDifference() public void testDifference() {
{ assertEquals(null, StringUtils.difference(null, null));
assertEquals("i am a robot", StringUtils.difference(null, "i am a robot"));
assertEquals("i am a machine", StringUtils.difference("i am a machine", null));
assertEquals("robot", StringUtils.difference("i am a machine", "i am a robot")); assertEquals("robot", StringUtils.difference("i am a machine", "i am a robot"));
assertEquals("", StringUtils.difference("foo", "foo")); assertEquals("", StringUtils.difference("foo", "foo"));
assertEquals("you are a robot", StringUtils.difference("i am a robot", "you are a robot")); assertEquals("you are a robot", StringUtils.difference("i am a robot", "you are a robot"));
} }
public void testDifferenceAt() public void testDifferenceAt() {
{ assertEquals(-1, StringUtils.differenceAt(null, null));
assertEquals(0, StringUtils.differenceAt(null, "i am a robot"));
assertEquals(0, StringUtils.differenceAt("i am a machine", null));
assertEquals(7, StringUtils.differenceAt("i am a machine", "i am a robot")); assertEquals(7, StringUtils.differenceAt("i am a machine", "i am a robot"));
assertEquals(-1, StringUtils.differenceAt("foo", "foo")); assertEquals(-1, StringUtils.differenceAt("foo", "foo"));
assertEquals(0, StringUtils.differenceAt("i am a robot", "you are a robot")); assertEquals(0, StringUtils.differenceAt("i am a robot", "you are a robot"));