Skip to content

Added missing Macintosh line break #51

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 3 commits into from
Jan 21, 2016
Merged

Added missing Macintosh line break #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c9de13
Added missing Macintosh line break
joe-mojo Jan 20, 2016
66ebfb5
test macintosh line break
seblm Jan 20, 2016
0b18e0f
Merge pull request #1 from xebia-france/master
joe-mojo Jan 20, 2016
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 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 @@ -233,7 +233,7 @@ public Builder somethingButNot(final String pValue) {
* @return this builder
*/
public Builder lineBreak() {
return this.add("(?:\\n|(?:\\r\\n))");
return this.add("(?:\\n|(?:\\r\\n)|(?:\\r\\r))");
}

/**
Expand Down
12 changes: 12 additions & 0 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 @@ -178,6 +178,18 @@ public void testLineBreak() {
assertThat("abc then line break then space then def", testRegex, not(matchesTo("abc\r\n def")));
}

@Test
public void testMacintoshLineBreak() {
VerbalExpression testRegex = new VerbalExpression.Builder()
.startOfLine()
.then("abc")
.lineBreak()
.then("def")
.build();

assertThat("abc then line break then def", testRegex, matchesTo("abc\r\rdef"));
}

@Test
public void testBr() {
VerbalExpression testRegexBr = new VerbalExpression.Builder()
Expand Down