Rename properties of SpaceBetweenAlphabeticalWordValidator

redpen-cc · Jan 14, 2017 · dcf1165 · dcf1165
1 parent 79b38c5
commit dcf1165
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...ore/src/main/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidator.java b/...ore/src/main/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidator.java
@@ -41,8 +41,8 @@ public class SpaceBetweenAlphabeticalWordValidator extends Validator {
 
     public SpaceBetweenAlphabeticalWordValidator() {
         super("forbidden", false, // Spaces are enforced (false) or forbidden (true)
-              "skip_before_chars", "",
-              "skip_after_chars", "");
+              "skip_before", "",
+              "skip_after", "");
     }
 
     @Override public List<String> getSupportedLanguages() {
@@ -78,7 +78,7 @@ public void validate(Sentence sentence) {
     // TODO: need refactoring...
     private boolean notHasWhiteSpaceBeforeLeftParenthesis(char prevCharacter, char character) {
         return !StringUtils.isBasicLatin(prevCharacter)
-                && getString("skip_before_chars").indexOf(prevCharacter) == -1
+                && getString("skip_before").indexOf(prevCharacter) == -1
                 && prevCharacter != leftParenthesis
                 && prevCharacter != comma
                 && (prevCharacter != rightParenthesis && rightParenthesis != '）') // For handling multi-byte Parenthesis
@@ -88,7 +88,7 @@ && getString("skip_before_chars").indexOf(prevCharacter) == -1
 
     private boolean notHasWhiteSpaceAfterRightParenthesis(char prevCharacter, char character) {
         return !StringUtils.isBasicLatin(character)
-                && getString("skip_after_chars").indexOf(character) == -1
+                && getString("skip_after").indexOf(character) == -1
                 && character != rightParenthesis
                 && (character != leftParenthesis && leftParenthesis != '（')  // For handling multi-byte Parenthesis
                 && character != comma

diff --git a/...src/test/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidatorTest.java b/...src/test/java/cc/redpen/validator/sentence/SpaceBetweenAlphabeticalWordValidatorTest.java
@@ -207,29 +207,29 @@ public void testNeedNoBeforeAndAfterSpace() throws RedPenException {
     }
 
     @Test
-    public void testSkipBeforeChars() throws RedPenException {
+    public void testSkipBefore() throws RedPenException {
         SpaceBetweenAlphabeticalWordValidator validator = new SpaceBetweenAlphabeticalWordValidator();
-        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_before_chars", "「"), Configuration.builder().build());
+        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_before", "「"), Configuration.builder().build());
         List<ValidationError> errors = new ArrayList<>();
         validator.setErrorList(errors);
         validator.validate(new Sentence("きょうは「Coke 」を飲みたい。", 0));
         assertEquals(0, errors.size());
     }
 
     @Test
-    public void testSkipAfterChars() throws RedPenException {
+    public void testSkipAfter() throws RedPenException {
         SpaceBetweenAlphabeticalWordValidator validator = new SpaceBetweenAlphabeticalWordValidator();
-        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_after_chars", "」"), Configuration.builder().build());
+        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_after", "」"), Configuration.builder().build());
         List<ValidationError> errors = new ArrayList<>();
         validator.setErrorList(errors);
         validator.validate(new Sentence("きょうは「 Coke」を飲みたい。", 0));
         assertEquals(0, errors.size());
     }
 
     @Test
-    public void testSkipBeforeAndAfterChars() throws RedPenException {
+    public void testSkipBeforeAndAfter() throws RedPenException {
         SpaceBetweenAlphabeticalWordValidator validator = new SpaceBetweenAlphabeticalWordValidator();
-        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_before_chars", "・「").addProperty("skip_after_chars", "・」"), Configuration.builder().build());
+        validator.preInit(new ValidatorConfiguration("SpaceBetweenAlphabeticalWord").addProperty("skip_before", "・「").addProperty("skip_after", "・」"), Configuration.builder().build());
         List<ValidationError> errors = new ArrayList<>();
         validator.setErrorList(errors);
         validator.validate(new Sentence("きょうは「Coke・Pepsi」を飲みたい。", 0));