Rolling StringUtils and test code back to r1082046. The move to CharSequence is theoretically desirable, but there are no common immutable CharSequence subclasses other than String, making this a complex and useless change. Instead StrBuilder should be enhanced. LANG-687
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1088444 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f5a6dc28f5
commit
9946140913
File diff suppressed because it is too large
Load Diff
|
@ -467,8 +467,6 @@ public void testIndexOf_char() {
|
||||||
assertEquals(-1, StringUtils.indexOf("", ' '));
|
assertEquals(-1, StringUtils.indexOf("", ' '));
|
||||||
assertEquals(0, StringUtils.indexOf("aabaabaa", 'a'));
|
assertEquals(0, StringUtils.indexOf("aabaabaa", 'a'));
|
||||||
assertEquals(2, StringUtils.indexOf("aabaabaa", 'b'));
|
assertEquals(2, StringUtils.indexOf("aabaabaa", 'b'));
|
||||||
|
|
||||||
assertEquals(2, StringUtils.indexOf(new StringBuilder("aabaabaa"), 'b'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testIndexOf_charInt() {
|
public void testIndexOf_charInt() {
|
||||||
|
@ -481,8 +479,6 @@ public void testIndexOf_charInt() {
|
||||||
assertEquals(5, StringUtils.indexOf("aabaabaa", 'b', 3));
|
assertEquals(5, StringUtils.indexOf("aabaabaa", 'b', 3));
|
||||||
assertEquals(-1, StringUtils.indexOf("aabaabaa", 'b', 9));
|
assertEquals(-1, StringUtils.indexOf("aabaabaa", 'b', 9));
|
||||||
assertEquals(2, StringUtils.indexOf("aabaabaa", 'b', -1));
|
assertEquals(2, StringUtils.indexOf("aabaabaa", 'b', -1));
|
||||||
|
|
||||||
assertEquals(5, StringUtils.indexOf(new StringBuilder("aabaabaa"), 'b', 3));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testIndexOf_String() {
|
public void testIndexOf_String() {
|
||||||
|
@ -493,8 +489,6 @@ public void testIndexOf_String() {
|
||||||
assertEquals(2, StringUtils.indexOf("aabaabaa", "b"));
|
assertEquals(2, StringUtils.indexOf("aabaabaa", "b"));
|
||||||
assertEquals(1, StringUtils.indexOf("aabaabaa", "ab"));
|
assertEquals(1, StringUtils.indexOf("aabaabaa", "ab"));
|
||||||
assertEquals(0, StringUtils.indexOf("aabaabaa", ""));
|
assertEquals(0, StringUtils.indexOf("aabaabaa", ""));
|
||||||
|
|
||||||
assertEquals(2, StringUtils.indexOf(new StringBuilder("aabaabaa"), "b"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testIndexOf_StringInt() {
|
public void testIndexOf_StringInt() {
|
||||||
|
@ -518,8 +512,6 @@ public void testIndexOf_StringInt() {
|
||||||
assertEquals(-1, StringUtils.indexOf("aabaabaa", "b", 9));
|
assertEquals(-1, StringUtils.indexOf("aabaabaa", "b", 9));
|
||||||
assertEquals(2, StringUtils.indexOf("aabaabaa", "b", -1));
|
assertEquals(2, StringUtils.indexOf("aabaabaa", "b", -1));
|
||||||
assertEquals(2,StringUtils.indexOf("aabaabaa", "", 2));
|
assertEquals(2,StringUtils.indexOf("aabaabaa", "", 2));
|
||||||
|
|
||||||
assertEquals(5, StringUtils.indexOf(new StringBuilder("aabaabaa"), "b", 3));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testIndexOfAny_StringCharArray() {
|
public void testIndexOfAny_StringCharArray() {
|
||||||
|
@ -675,8 +667,6 @@ public void testLastIndexOf_char() {
|
||||||
assertEquals(-1, StringUtils.lastIndexOf("", ' '));
|
assertEquals(-1, StringUtils.lastIndexOf("", ' '));
|
||||||
assertEquals(7, StringUtils.lastIndexOf("aabaabaa", 'a'));
|
assertEquals(7, StringUtils.lastIndexOf("aabaabaa", 'a'));
|
||||||
assertEquals(5, StringUtils.lastIndexOf("aabaabaa", 'b'));
|
assertEquals(5, StringUtils.lastIndexOf("aabaabaa", 'b'));
|
||||||
|
|
||||||
assertEquals(5, StringUtils.lastIndexOf(new StringBuilder("aabaabaa"), 'b'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testLastIndexOf_charInt() {
|
public void testLastIndexOf_charInt() {
|
||||||
|
@ -690,8 +680,6 @@ public void testLastIndexOf_charInt() {
|
||||||
assertEquals(5, StringUtils.lastIndexOf("aabaabaa", 'b', 9));
|
assertEquals(5, StringUtils.lastIndexOf("aabaabaa", 'b', 9));
|
||||||
assertEquals(-1, StringUtils.lastIndexOf("aabaabaa", 'b', -1));
|
assertEquals(-1, StringUtils.lastIndexOf("aabaabaa", 'b', -1));
|
||||||
assertEquals(0, StringUtils.lastIndexOf("aabaabaa", 'a', 0));
|
assertEquals(0, StringUtils.lastIndexOf("aabaabaa", 'a', 0));
|
||||||
|
|
||||||
assertEquals(2, StringUtils.lastIndexOf(new StringBuilder("aabaabaa"), 'b', 2));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testLastIndexOf_String() {
|
public void testLastIndexOf_String() {
|
||||||
|
@ -703,8 +691,6 @@ public void testLastIndexOf_String() {
|
||||||
assertEquals(7, StringUtils.lastIndexOf("aabaabaa", "a"));
|
assertEquals(7, StringUtils.lastIndexOf("aabaabaa", "a"));
|
||||||
assertEquals(5, StringUtils.lastIndexOf("aabaabaa", "b"));
|
assertEquals(5, StringUtils.lastIndexOf("aabaabaa", "b"));
|
||||||
assertEquals(4, StringUtils.lastIndexOf("aabaabaa", "ab"));
|
assertEquals(4, StringUtils.lastIndexOf("aabaabaa", "ab"));
|
||||||
|
|
||||||
assertEquals(4, StringUtils.lastIndexOf(new StringBuilder("aabaabaa"), "ab"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testLastIndexOf_StringInt() {
|
public void testLastIndexOf_StringInt() {
|
||||||
|
@ -728,8 +714,6 @@ public void testLastIndexOf_StringInt() {
|
||||||
assertEquals(-1, StringUtils.lastIndexOf("aabaabaa", "b", -1));
|
assertEquals(-1, StringUtils.lastIndexOf("aabaabaa", "b", -1));
|
||||||
assertEquals(-1, StringUtils.lastIndexOf("aabaabaa", "b", 0));
|
assertEquals(-1, StringUtils.lastIndexOf("aabaabaa", "b", 0));
|
||||||
assertEquals(0, StringUtils.lastIndexOf("aabaabaa", "a", 0));
|
assertEquals(0, StringUtils.lastIndexOf("aabaabaa", "a", 0));
|
||||||
|
|
||||||
assertEquals(2, StringUtils.lastIndexOf(new StringBuilder("aabaabaa"), "b", 3));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testLastIndexOfAny_StringStringArray() {
|
public void testLastIndexOfAny_StringStringArray() {
|
||||||
|
|
Loading…
Reference in New Issue