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

Adding 'Deprecated' to tests which are testing deprecated methods and moving CharSetUtils from the deprecated evaluateSet method to a new getInstance(String[]) method. This does mean that getInstance(null) is no longer going to compile for people - they'll need to cast the null. 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@534588 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2007-05-02 18:46:07 +00:00
parent 75d931a326
commit 1c1064c917
8 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/commons/lang/CharSet.java
View File

@ -146,6 +146,19 @@ public static CharSet getInstance(String setStr) {
return new CharSet(setStr);
}
/**
* <p>Constructs a new CharSet using the set syntax.
* Each string is merged in with the set.</p>
*
* @param set Strings to merge into the initial set, may be null
*/
public static CharSet getInstance(String[] setStrs) {
if (setStrs == null) {
return null;
}
return new CharSet(setStrs);
}
//-----------------------------------------------------------------------
/**
* <p>Constructs a new CharSet using the set syntax.</p>

8
src/java/org/apache/commons/lang/CharSetUtils.java
View File

@ -63,7 +63,7 @@ public CharSetUtils() {
*
* @param set the set, may be null
* @return a CharSet instance, <code>null</code> if null input
* @deprecated Use {@link CharSet#getInstance(String)}.
* @deprecated Use {@link CharSet#getInstance(String[])}.
* Method will be removed in Commons Lang 3.0.
*/
public static CharSet evaluateSet(String[] set) {
@ -120,7 +120,7 @@ public static String squeeze(String str, String[] set) {
if (StringUtils.isEmpty(str) || ArrayUtils.isEmpty(set)) {
return str;
}
CharSet chars = evaluateSet(set);
CharSet chars = CharSet.getInstance(set);
StringBuffer buffer = new StringBuffer(str.length());
char[] chrs = str.toCharArray();
int sz = chrs.length;
@ -186,7 +186,7 @@ public static int count(String str, String[] set) {
if (StringUtils.isEmpty(str) || ArrayUtils.isEmpty(set)) {
return 0;
}
CharSet chars = evaluateSet(set);
CharSet chars = CharSet.getInstance(set);
int count = 0;
char[] chrs = str.toCharArray();
int sz = chrs.length;
@ -318,7 +318,7 @@ public static String delete(String str, String[] set) {
* @return modified String
*/
private static String modify(String str, String[] set, boolean expect) {
CharSet chars = evaluateSet(set);
CharSet chars = CharSet.getInstance(set);
StringBuffer buffer = new StringBuffer(str.length());
char[] chrs = str.toCharArray();
int sz = chrs.length;

12
src/test/org/apache/commons/lang/CharSetTest.java
View File

@ -64,7 +64,7 @@ public void testClass() {
//-----------------------------------------------------------------------
public void testGetInstance() {
assertSame(CharSet.EMPTY, CharSet.getInstance(null));
assertSame(CharSet.EMPTY, CharSet.getInstance( (String) null));
assertSame(CharSet.EMPTY, CharSet.getInstance(""));
assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("a-zA-Z"));
assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("A-Za-z"));
@ -72,7 +72,15 @@ public void testGetInstance() {
assertSame(CharSet.ASCII_ALPHA_UPPER, CharSet.getInstance("A-Z"));
assertSame(CharSet.ASCII_NUMERIC, CharSet.getInstance("0-9"));
}
//-----------------------------------------------------------------------
public void testGetInstance_Stringarray() {
assertEquals(null, CharSet.getInstance((String[]) null));
assertEquals("[]", CharSet.getInstance(new String[0]).toString());
assertEquals("[]", CharSet.getInstance(new String[] {null}).toString());
assertEquals("[a-e]", CharSet.getInstance(new String[] {"a-e"}).toString());
}
//-----------------------------------------------------------------------
public void testConstructor_String_simple() {
CharSet set;

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

@ -332,7 +332,7 @@ public void testCountMatches_String() {
StringUtils.countMatches("oooooooooooo", "ooo"));
}
public void testGetNestedString_StringString() {
public void testDeprecatedGetNestedString_StringString() {
assertEquals(null, StringUtils.getNestedString(null, "tag"));
assertEquals("", StringUtils.getNestedString("", ""));
assertEquals(null, StringUtils.getNestedString("", "abc"));
@ -345,7 +345,7 @@ public void testGetNestedString_StringString() {
assertEquals("bar", StringUtils.getNestedString("\nbar\n", "\n"));
}
public void testGetNestedString_StringStringString() {
public void testDeprecatedGetNestedString_StringStringString() {
assertEquals(null, StringUtils.getNestedString(null, "", ""));
assertEquals("", StringUtils.getNestedString("", "", ""));
assertEquals("", StringUtils.getNestedString(" ", " ", " "));

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

@ -300,7 +300,7 @@ public void testJoin_CollectionString() {
assertEquals(TEXT_LIST, StringUtils.join(Arrays.asList(ARRAY_LIST), SEPARATOR));
}
public void testConcatenate_Objectarray() {
public void testDeprecatedConcatenate_Objectarray() {
assertEquals(null, StringUtils.concatenate(null));
assertEquals("", StringUtils.concatenate(EMPTY_ARRAY_LIST));
assertEquals("", StringUtils.concatenate(NULL_ARRAY_LIST));
@ -847,7 +847,7 @@ private void innerTestSplitPreserveAllTokens(char separator, String sepStr, char
assertEquals(msg, str.substring(2), res[1]);
}
public void testDeleteSpace_String() {
public void testDeprecatedDeleteSpace_String() {
assertEquals(null, StringUtils.deleteSpaces(null));
assertEquals("", StringUtils.deleteSpaces(""));
assertEquals("", StringUtils.deleteSpaces(" \t\t\n\n "));
@ -984,7 +984,7 @@ public void testReplaceChars_StringStringString() {
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM567891234"));
}
public void testOverlayString_StringStringIntInt() {
public void testDeprecatedOverlayString_StringStringIntInt() {
assertEquals("overlayString(String, String, int, int) failed",
"foo foor baz", StringUtils.overlayString(SENTENCE_UNCAP, FOO_UNCAP, 4, 6) );
assertEquals("abef", StringUtils.overlayString("abcdef", "", 2, 4));
@ -1310,7 +1310,7 @@ public void testReverseDelimited_StringChar() {
assertEquals("", StringUtils.reverseDelimited("", '.') );
}
public void testReverseDelimitedString_StringString() {
public void testDeprecatedReverseDelimitedString_StringString() {
assertEquals(null, StringUtils.reverseDelimitedString(null, null) );
assertEquals("", StringUtils.reverseDelimitedString("", null) );
assertEquals("", StringUtils.reverseDelimitedString("", ".") );
@ -1339,7 +1339,7 @@ public void testDefaultIfEmpty_StringString() {
}
//-----------------------------------------------------------------------
public void testEscapeFunctions_String() {
public void testDeprecatedEscapeFunctions_String() {
assertEquals("", StringUtils.escape("") );
assertEquals("abc", StringUtils.escape("abc") );
assertEquals("\\t", StringUtils.escape("\t") );

2
src/test/org/apache/commons/lang/StringUtilsTrimEmptyTest.java
View File

@ -87,7 +87,7 @@ public void testIsNotBlank() {
}
//-----------------------------------------------------------------------
public void testClean() {
public void testDeprecatedClean() {
assertEquals(FOO, StringUtils.clean(FOO + " "));
assertEquals(FOO, StringUtils.clean(" " + FOO + " "));
assertEquals(FOO, StringUtils.clean(" " + FOO));

2
src/test/org/apache/commons/lang/SystemUtilsTest.java
View File

@ -333,7 +333,7 @@ public void testIS_OS() {
}
//-----------------------------------------------------------------------
public void testJavaVersion() {
public void testDeprecatedJavaVersion() {
assertEquals(SystemUtils.JAVA_VERSION_FLOAT, SystemUtils.getJavaVersion(), 0f);
}

4
src/test/org/apache/commons/lang/math/NumberUtilsTest.java
View File

@ -70,7 +70,7 @@ public void testConstructor() {
/**
* Test for {@link NumberUtils#stringToInt(String)}.
*/
public void testStringToIntString() {
public void testDeprecatedStringToIntString() {
assertTrue("stringToInt(String) 1 failed", NumberUtils.stringToInt("12345") == 12345);
assertTrue("stringToInt(String) 2 failed", NumberUtils.stringToInt("abc") == 0);
assertTrue("stringToInt(empty) failed", NumberUtils.stringToInt("") == 0);
@ -90,7 +90,7 @@ public void testToIntString() {
/**
* Test for {@link NumberUtils#stringToInt(String, int)}.
*/
public void testStringToIntStringI() {
public void testDeprecatedStringToIntStringI() {
assertTrue("stringToInt(String,int) 1 failed", NumberUtils.stringToInt("12345", 5) == 12345);
assertTrue("stringToInt(String,int) 2 failed", NumberUtils.stringToInt("1234.5", 5) == 5);
}