Merge branch 'RED-7902' into 'master'
RED-7902: fix author name splitting Closes RED-7902 See merge request redactmanager/redaction-service!204
This commit is contained in:
commit
5c652df904
@ -11,7 +11,7 @@ public final class Patterns {
|
||||
|
||||
public static final Map<String, Pattern> patternCache = new HashMap<>();
|
||||
|
||||
public static final Pattern AUTHOR_NAME_PATTERN = Pattern.compile("^(?!\\w*[.]$)\\p{L}+[.\\p{L}\\s]*$");
|
||||
public static final Pattern AUTHOR_NAME_PATTERN = Pattern.compile("^(?!\\w*[.]$)\\p{Lu}\\p{L}*[.\\p{L}\\s]*$");
|
||||
|
||||
|
||||
public Pattern getCompiledPattern(String pattern, boolean caseInsensitive) {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.iqser.red.service.redaction.v1.server.rules;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.wildfly.common.Assert.assertFalse;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
@ -10,6 +11,7 @@ import org.junit.jupiter.api.Test;
|
||||
|
||||
import com.iqser.red.service.redaction.v1.server.model.dictionary.Dictionary;
|
||||
import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
|
||||
import com.iqser.red.service.redaction.v1.server.utils.Patterns;
|
||||
|
||||
public class Cbi11Test extends RulesIntegrationTest {
|
||||
|
||||
@ -25,4 +27,10 @@ public class Cbi11Test extends RulesIntegrationTest {
|
||||
assertThat(authorNames).containsExactlyInAnyOrder("Cargile", "N.L.", "Ross", "J.A.", "Egli", "Ramsteiner");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAndIsNotAnAuthorName() {
|
||||
|
||||
assertFalse(Patterns.AUTHOR_NAME_PATTERN.matcher("and").matches());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user