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

More Javadoc and tests

This commit is contained in:
Sebb 2015-12-11 23:10:32 +00:00
parent a5ad80d754
commit bfcdeeaf44
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/commons/lang3/StringUtils.java
View File

@ -1205,7 +1205,8 @@ public class StringUtils {
/** /**
* <p>Finds the n-th index within a CharSequence, handling {@code null}. * <p>Finds the n-th index within a CharSequence, handling {@code null}.
* This method uses {@link String#indexOf(String)} if possible.</p> * This method uses {@link String#indexOf(String)} if possible.</p>
* * <p><b>Note:</b> The code starts looking for a match at the start of the target,
* incrementing the starting index by one after each successful match.</p>
* <p>A {@code null} CharSequence will return {@code -1}.</p> * <p>A {@code null} CharSequence will return {@code -1}.</p>
* *
* <pre> * <pre>
@ -1224,9 +1225,14 @@ public class StringUtils {
* *
* <p>Matches may overlap:</p> * <p>Matches may overlap:</p>
* <pre> * <pre>
* StringUtils.ordinalIndexOf("ababab","aba", 1) = 0 * StringUtils.ordinalIndexOf("ababab","aba", 1) = 0
* StringUtils.ordinalIndexOf("ababab","aba", 2) = 2 * StringUtils.ordinalIndexOf("ababab","aba", 2) = 2
* StringUtils.ordinalIndexOf("ababab","aba", 3) = -1 * StringUtils.ordinalIndexOf("ababab","aba", 3 = -1
*
* StringUtils.ordinalIndexOf("abababab", "abab", 1) = 0
* StringUtils.ordinalIndexOf("abababab", "abab", 2) = 2
* StringUtils.ordinalIndexOf("abababab", "abab", 3) = 4
* StringUtils.ordinalIndexOf("abababab", "abab", 4) = -1
* </pre> * </pre>
* *
* <p>Note that 'head(CharSequence str, int n)' may be implemented as: </p> * <p>Note that 'head(CharSequence str, int n)' may be implemented as: </p>

7
src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
View File

@ -1148,6 +1148,7 @@ public class StringUtilsEqualsIndexOfTest {
assertEquals(8, StringUtils.ordinalIndexOf("aaaaaaaaa", "a", 9)); assertEquals(8, StringUtils.ordinalIndexOf("aaaaaaaaa", "a", 9));
assertEquals(-1, StringUtils.ordinalIndexOf("aaaaaaaaa", "a", 10)); assertEquals(-1, StringUtils.ordinalIndexOf("aaaaaaaaa", "a", 10));
// match at each possible position
assertEquals(0, StringUtils.ordinalIndexOf("aaaaaa", "aa", 1)); assertEquals(0, StringUtils.ordinalIndexOf("aaaaaa", "aa", 1));
assertEquals(1, StringUtils.ordinalIndexOf("aaaaaa", "aa", 2)); assertEquals(1, StringUtils.ordinalIndexOf("aaaaaa", "aa", 2));
assertEquals(2, StringUtils.ordinalIndexOf("aaaaaa", "aa", 3)); assertEquals(2, StringUtils.ordinalIndexOf("aaaaaa", "aa", 3));
@ -1158,6 +1159,12 @@ public class StringUtilsEqualsIndexOfTest {
assertEquals(0, StringUtils.ordinalIndexOf("ababab", "aba", 1)); assertEquals(0, StringUtils.ordinalIndexOf("ababab", "aba", 1));
assertEquals(2, StringUtils.ordinalIndexOf("ababab", "aba", 2)); assertEquals(2, StringUtils.ordinalIndexOf("ababab", "aba", 2));
assertEquals(-1, StringUtils.ordinalIndexOf("ababab", "aba", 3)); assertEquals(-1, StringUtils.ordinalIndexOf("ababab", "aba", 3));
assertEquals(0, StringUtils.ordinalIndexOf("abababab", "abab", 1));
assertEquals(2, StringUtils.ordinalIndexOf("abababab", "abab", 2));
assertEquals(4, StringUtils.ordinalIndexOf("abababab", "abab", 3));
assertEquals(-1, StringUtils.ordinalIndexOf("abababab", "abab", 4));
} }
@Test @Test