This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
The following commit(s) were added to refs/heads/master by this push:
new daf6a09 Sort members.
daf6a09 is described below
commit daf6a090d686146f469346571ba30c81667a87ed
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Dec 11 12:16:36 2019 -0500
Sort members.
---
.../commons/text/matcher/StringMatcherTest.java | 210 ++++++++++-----------
1 file changed, 105 insertions(+), 105 deletions(-)
diff --git
a/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
b/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
index e4d4902..e45b053 100644
--- a/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
+++ b/src/test/java/org/apache/commons/text/matcher/StringMatcherTest.java
@@ -31,74 +31,60 @@ public class StringMatcherTest {
// -----------------------------------------------------------------------
@Test
- public void testCommaMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.commaMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.commaMatcher()).isSameAs(matcher);
- assertThat(matcher.isMatch(BUFFER1, 0, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 1, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
- }
-
- // -----------------------------------------------------------------------
- @Test
- public void testTabMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.tabMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.tabMatcher()).isSameAs(matcher);
- assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 3, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
+ public void testCharMatcher_char() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.charMatcher('c');
+ assertThat(matcher.isMatch(BUFFER2, 0, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 1, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 2, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 3, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 4, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 5, 0,
BUFFER2.length)).isEqualTo(0);
}
// -----------------------------------------------------------------------
@Test
- public void testSpaceMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.spaceMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.spaceMatcher()).isSameAs(matcher);
- assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 5, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 6, 0,
BUFFER1.length)).isEqualTo(0);
+ public void testCharSetMatcher_charArray() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.charSetMatcher("ace".toCharArray());
+ assertThat(matcher.isMatch(BUFFER2, 0, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 1, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 2, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 3, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 4, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 5, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(StringMatcherFactory.INSTANCE.charSetMatcher(new char[0]))
+ .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
+ assertThat(StringMatcherFactory.INSTANCE.charSetMatcher((char[]) null))
+ .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
+ assertThat(StringMatcherFactory.INSTANCE
+ .charSetMatcher("a".toCharArray()) instanceof
AbstractStringMatcher.CharMatcher).isTrue();
}
// -----------------------------------------------------------------------
@Test
- public void testSplitMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.splitMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.splitMatcher()).isSameAs(matcher);
- assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 3, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 5, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 6, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 7, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 8, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 9, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(0);
+ public void testCharSetMatcher_String() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.charSetMatcher("ace");
+ assertThat(matcher.isMatch(BUFFER2, 0, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 1, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 2, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 3, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER2, 4, 0,
BUFFER2.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER2, 5, 0,
BUFFER2.length)).isEqualTo(0);
+ assertThat(StringMatcherFactory.INSTANCE.charSetMatcher(""))
+ .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
+ assertThat(StringMatcherFactory.INSTANCE.charSetMatcher((String) null))
+ .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
+ assertThat(StringMatcherFactory.INSTANCE.charSetMatcher("a")
instanceof AbstractStringMatcher.CharMatcher)
+ .isTrue();
}
// -----------------------------------------------------------------------
@Test
- public void testTrimMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.trimMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.trimMatcher()).isSameAs(matcher);
+ public void testCommaMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.commaMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.commaMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 0, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 1, 0,
BUFFER1.length)).isEqualTo(1);
assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 3, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 5, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 6, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 7, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 8, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 9, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(1);
- }
-
- // -----------------------------------------------------------------------
- @Test
- public void testSingleQuoteMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.singleQuoteMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.singleQuoteMatcher()).isSameAs(matcher);
- assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 11, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 12, 0,
BUFFER1.length)).isEqualTo(0);
}
// -----------------------------------------------------------------------
@@ -112,12 +98,14 @@ public class StringMatcherTest {
// -----------------------------------------------------------------------
@Test
- public void testQuoteMatcher() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.quoteMatcher();
-
assertThat(StringMatcherFactory.INSTANCE.quoteMatcher()).isSameAs(matcher);
- assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER1, 11, 0,
BUFFER1.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER1, 12, 0,
BUFFER1.length)).isEqualTo(1);
+ public void testMatcherIndices() {
+ // remember that the API contract is tight for the isMatch() method
+ // all the onus is on the caller, so invalid inputs are not
+ // the concern of StringMatcher, and are not bugs
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.stringMatcher("bc");
+ assertThat(matcher.isMatch(BUFFER2, 1, 1,
BUFFER2.length)).isEqualTo(2);
+ assertThat(matcher.isMatch(BUFFER2, 1, 0, 3)).isEqualTo(2);
+ assertThat(matcher.isMatch(BUFFER2, 1, 0, 2)).isEqualTo(0);
}
// -----------------------------------------------------------------------
@@ -142,50 +130,48 @@ public class StringMatcherTest {
// -----------------------------------------------------------------------
@Test
- public void testCharMatcher_char() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.charMatcher('c');
- assertThat(matcher.isMatch(BUFFER2, 0, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 1, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 2, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 3, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 4, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 5, 0,
BUFFER2.length)).isEqualTo(0);
+ public void testQuoteMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.quoteMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.quoteMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 11, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 12, 0,
BUFFER1.length)).isEqualTo(1);
}
// -----------------------------------------------------------------------
@Test
- public void testCharSetMatcher_String() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.charSetMatcher("ace");
- assertThat(matcher.isMatch(BUFFER2, 0, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 1, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 2, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 3, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 4, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 5, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(StringMatcherFactory.INSTANCE.charSetMatcher(""))
- .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
- assertThat(StringMatcherFactory.INSTANCE.charSetMatcher((String) null))
- .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
- assertThat(StringMatcherFactory.INSTANCE.charSetMatcher("a")
instanceof AbstractStringMatcher.CharMatcher)
- .isTrue();
+ public void testSingleQuoteMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.singleQuoteMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.singleQuoteMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 11, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 12, 0,
BUFFER1.length)).isEqualTo(0);
}
// -----------------------------------------------------------------------
@Test
- public void testCharSetMatcher_charArray() {
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.charSetMatcher("ace".toCharArray());
- assertThat(matcher.isMatch(BUFFER2, 0, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 1, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 2, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 3, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(matcher.isMatch(BUFFER2, 4, 0,
BUFFER2.length)).isEqualTo(1);
- assertThat(matcher.isMatch(BUFFER2, 5, 0,
BUFFER2.length)).isEqualTo(0);
- assertThat(StringMatcherFactory.INSTANCE.charSetMatcher(new char[0]))
- .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
- assertThat(StringMatcherFactory.INSTANCE.charSetMatcher((char[]) null))
- .isSameAs(StringMatcherFactory.INSTANCE.noneMatcher());
- assertThat(StringMatcherFactory.INSTANCE
- .charSetMatcher("a".toCharArray()) instanceof
AbstractStringMatcher.CharMatcher).isTrue();
+ public void testSpaceMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.spaceMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.spaceMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 5, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 6, 0,
BUFFER1.length)).isEqualTo(0);
+ }
+
+ // -----------------------------------------------------------------------
+ @Test
+ public void testSplitMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.splitMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.splitMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 3, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 5, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 6, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 7, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 8, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 9, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(0);
}
// -----------------------------------------------------------------------
@@ -206,14 +192,28 @@ public class StringMatcherTest {
// -----------------------------------------------------------------------
@Test
- public void testMatcherIndices() {
- // remember that the API contract is tight for the isMatch() method
- // all the onus is on the caller, so invalid inputs are not
- // the concern of StringMatcher, and are not bugs
- final StringMatcher matcher =
StringMatcherFactory.INSTANCE.stringMatcher("bc");
- assertThat(matcher.isMatch(BUFFER2, 1, 1,
BUFFER2.length)).isEqualTo(2);
- assertThat(matcher.isMatch(BUFFER2, 1, 0, 3)).isEqualTo(2);
- assertThat(matcher.isMatch(BUFFER2, 1, 0, 2)).isEqualTo(0);
+ public void testTabMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.tabMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.tabMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 3, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
+ }
+
+ // -----------------------------------------------------------------------
+ @Test
+ public void testTrimMatcher() {
+ final StringMatcher matcher =
StringMatcherFactory.INSTANCE.trimMatcher();
+
assertThat(StringMatcherFactory.INSTANCE.trimMatcher()).isSameAs(matcher);
+ assertThat(matcher.isMatch(BUFFER1, 2, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 3, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 4, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 5, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 6, 0,
BUFFER1.length)).isEqualTo(0);
+ assertThat(matcher.isMatch(BUFFER1, 7, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 8, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 9, 0,
BUFFER1.length)).isEqualTo(1);
+ assertThat(matcher.isMatch(BUFFER1, 10, 0,
BUFFER1.length)).isEqualTo(1);
}
}
