Skip to content

Fixing the handling of (unmatched) optional capture groups #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 19, 2021
Merged

Fixing the handling of (unmatched) optional capture groups #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5af8239
adding test showing the problematic handling of optional capture groups
simschla Aug 21, 2020
0c1a4e7
do not return "null"-String
simschla Aug 21, 2020
c207923
upgrading travis jdk version
simschla Aug 21, 2020
a97d327
we no longer return the "null" string literal
simschla Aug 21, 2020
2ea705f
reduce assertions
simschla Mar 19, 2021
7b758c9
Update .travis.yml
lanwen Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: java
sudo: false

jdk:
- oraclejdk8
- openjdk8

install:
- mvn --settings .travis/settings.xml install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/ru/lanwen/verbalregex/VerbalExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,10 @@ public String getText(final String toTest, final int group) {
Matcher m = pattern.matcher(toTest);
StringBuilder result = new StringBuilder();
while (m.find()) {
result.append(m.group(group));
String groupValue = m.group(group);
if (groupValue != null) {
result.append(groupValue);
}
}
return result.toString();
}
Expand All @@ -781,7 +784,10 @@ public String getText(final String toTest, final String group) {
Matcher m = pattern.matcher(toTest);
StringBuilder result = new StringBuilder();
while (m.find()) {
result.append(m.group(group));
String groupValue = m.group(group);
if (groupValue != null) {
result.append(groupValue);
}
}
return result.toString();
}
Expand Down
24 changes: 12 additions & 12 deletions src/test/java/ru/lanwen/verbalregex/BasicFunctionalityUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,9 @@ public void testOrWithCapture() {
assertThat("Starts with abc or def", testRegex, matchesTo("abczzz"));
assertThat("Doesn't start with abc or def", testRegex, not(matchesExactly("xyzabcefg")));

assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
assertThat(testRegex.getText("xxxdefzzz", 1), equalTo("null"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abc"));
assertThat(testRegex.getText("xxxdefzzz", 1), equalTo(""));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abc"));
}

@Test
Expand All @@ -516,11 +516,11 @@ public void testOrWithNamedCapture() {
testRegex, not(matchesExactly("xyzabcefg")));

assertThat(testRegex.getText("xxxabcdefzzz", captureName),
equalTo("abcnull"));
equalTo("abc"));
assertThat(testRegex.getText("xxxdefzzz", captureName),
equalTo("null"));
equalTo(""));
assertThat(testRegex.getText("xxxabcdefzzz", captureName),
equalTo("abcnull"));
equalTo("abc"));
}

@Test
Expand All @@ -535,9 +535,9 @@ public void testOrWithClosedCapture() {
assertThat("Starts with abc or def", testRegex, matchesTo("abczzz"));
assertThat("Doesn't start with abc or def", testRegex, not(matchesExactly("xyzabcefg")));

assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
assertThat(testRegex.getText("xxxdefzzz", 1), equalTo("null"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abcnull"));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abc"));
assertThat(testRegex.getText("xxxdefzzz", 1), equalTo(""));
assertThat(testRegex.getText("xxxabcdefzzz", 1), equalTo("abc"));
}

@Test
Expand All @@ -555,11 +555,11 @@ public void testOrWithClosedNamedCapture() {
testRegex, not(matchesExactly("xyzabcefg")));

assertThat(testRegex.getText("xxxabcdefzzz", captureName),
equalTo("abcnull"));
equalTo("abc"));
assertThat(testRegex.getText("xxxdefzzz", captureName),
equalTo("null"));
equalTo(""));
assertThat(testRegex.getText("xxxabcdefzzz", captureName),
equalTo("abcnull"));
equalTo("abc"));
}

@Test
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/ru/lanwen/verbalregex/RealWorldUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.junit.Test;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static ru.lanwen.verbalregex.VerbalExpression.regex;
Expand Down Expand Up @@ -149,4 +150,20 @@ public void captureAfterNewLineHasANamedGroup() {
assertThat(some,
equalTo(expression.getText(lineBreak + some + text, captureName)));
}

@Test
public void missingOptionalCaptureGroupReturnsEmptyStringNotStringContainingNullLiteral() {
final VerbalExpression expression = VerbalExpression.regex().
startOfLine()
.capture("optionalCapture")
.oneOf("a", "b")
.endCapture()
.count(0, 1)
.then("c")
.endOfLine()
.build();
final String testString = "c";
assertThat(expression, matchesExactly(testString));
assertThat(expression.getText("c", "optionalCapture"), equalTo(""));
}
}