-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9758 from deybis17/quality-check-escaped-ampersand
Quality check escaped ampersand
- Loading branch information
Showing
6 changed files
with
117 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package org.jabref.logic.integrity; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.regex.MatchResult; | ||
import java.util.regex.Pattern; | ||
|
||
import org.jabref.logic.l10n.Localization; | ||
import org.jabref.model.entry.BibEntry; | ||
import org.jabref.model.entry.field.Field; | ||
|
||
import com.google.common.base.CharMatcher; | ||
|
||
/** | ||
* Checks if the BibEntry contains unescaped ampersands. | ||
*/ | ||
public class AmpersandChecker implements EntryChecker { | ||
// matches for an & preceded by any number of \ | ||
private static final Pattern BACKSLASH_PRECEDED_AMPERSAND = Pattern.compile("\\\\*&"); | ||
|
||
@Override | ||
public List<IntegrityMessage> check(BibEntry entry) { | ||
List<IntegrityMessage> results = new ArrayList<>(); | ||
|
||
for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) { | ||
// counts the number of even \ occurrences preceding an & | ||
long unescapedAmpersands = BACKSLASH_PRECEDED_AMPERSAND.matcher(field.getValue()) | ||
.results() | ||
.map(MatchResult::group) | ||
.filter(m -> CharMatcher.is('\\').countIn(m) % 2 == 0) | ||
.count(); | ||
|
||
if (unescapedAmpersands > 0) { | ||
results.add(new IntegrityMessage(Localization.lang("Found %0 unescaped '&'", unescapedAmpersands), entry, field.getKey())); | ||
// note: when changing the message - also do so in tests | ||
} | ||
} | ||
return results; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package org.jabref.logic.integrity; | ||
|
||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.stream.Stream; | ||
|
||
import org.jabref.model.entry.BibEntry; | ||
import org.jabref.model.entry.field.Field; | ||
import org.jabref.model.entry.field.StandardField; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.params.ParameterizedTest; | ||
import org.junit.jupiter.params.provider.Arguments; | ||
import org.junit.jupiter.params.provider.MethodSource; | ||
|
||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
||
public class AmpersandCheckerTest { | ||
|
||
private final AmpersandChecker checker = new AmpersandChecker(); | ||
private final BibEntry entry = new BibEntry(); | ||
|
||
@ParameterizedTest | ||
@MethodSource("provideAcceptedInputs") | ||
void acceptsAllowedInputs(List<IntegrityMessage> expected, Field field, String value) { | ||
entry.setField(field, value); | ||
assertEquals(expected, checker.check(entry)); | ||
} | ||
|
||
private static Stream<Arguments> provideAcceptedInputs() { | ||
return Stream.of( | ||
Arguments.of(Collections.emptyList(), StandardField.TITLE, "No ampersand at all"), | ||
Arguments.of(Collections.emptyList(), StandardField.FOREWORD, "Properly escaped \\&"), | ||
Arguments.of(Collections.emptyList(), StandardField.AUTHOR, "\\& Multiple properly escaped \\&"), | ||
Arguments.of(Collections.emptyList(), StandardField.BOOKTITLE, "\\\\\\& With multiple backslashes"), | ||
Arguments.of(Collections.emptyList(), StandardField.COMMENT, "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"), | ||
Arguments.of(Collections.emptyList(), StandardField.NOTE, "In the \\& middle of \\\\\\& something") | ||
); | ||
} | ||
|
||
@ParameterizedTest | ||
@MethodSource("provideUnacceptedInputs") | ||
void rejectsDisallowedInputs(String expectedMessage, Field field, String value) { | ||
entry.setField(field, value); | ||
assertEquals(List.of(new IntegrityMessage(expectedMessage, entry, field)), checker.check(entry)); | ||
} | ||
|
||
private static Stream<Arguments> provideUnacceptedInputs() { | ||
return Stream.of( | ||
Arguments.of("Found 1 unescaped '&'", StandardField.SUBTITLE, "A single &"), | ||
Arguments.of("Found 2 unescaped '&'", StandardField.ABSTRACT, "Multiple \\\\& not properly & escaped"), | ||
Arguments.of("Found 1 unescaped '&'", StandardField.AUTHOR, "To many backslashes \\\\&"), | ||
Arguments.of("Found 2 unescaped '&'", StandardField.LABEL, "\\\\\\\\& Multiple times \\\\& multiple backslashes") | ||
); | ||
} | ||
|
||
@Test | ||
void entryWithEscapedAndUnescapedAmpersand() { | ||
entry.setField(StandardField.TITLE, "Jack \\& Jill & more"); | ||
assertEquals(List.of(new IntegrityMessage("Found 1 unescaped '&'", entry, StandardField.TITLE)), checker.check(entry)); | ||
} | ||
|
||
@Test | ||
void entryWithMultipleEscapedAndUnescapedAmpersands() { | ||
entry.setField(StandardField.AFTERWORD, "May the force be with you & live long \\\\& prosper \\& to infinity \\\\\\& beyond & assemble \\\\\\\\& excelsior!"); | ||
assertEquals(List.of(new IntegrityMessage("Found 4 unescaped '&'", entry, StandardField.AFTERWORD)), checker.check(entry)); | ||
} | ||
} |