Merge pull request #739 from takahi-i/remove-colon-as-invalid-char

Remove colon from invalid character list in Japanese default setting
redpen-cc · Feb 19, 2017 · 46280c1 · 46280c1
2 parents 2a863dd + 84502a5
commit 46280c1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/redpen-core/src/main/java/cc/redpen/config/SymbolTable.java b/redpen-core/src/main/java/cc/redpen/config/SymbolTable.java
@@ -266,11 +266,11 @@ private static Map<SymbolType, Symbol> initializeSymbols(Symbol... newSymbols) {
                 , new Symbol(PLUS_SIGN, '＋', "")
                 , new Symbol(HYPHEN_SIGN, 'ー', "")
                 , new Symbol(SLASH, '／', "")
-                , new Symbol(COLON, '：', ":")
-                , new Symbol(SEMICOLON, '；', ";")
-                , new Symbol(LESS_THAN_SIGN, '＜', "<")
+                , new Symbol(COLON, '：', "")
+                , new Symbol(SEMICOLON, '；', "")
+                , new Symbol(LESS_THAN_SIGN, '＜', "")
                 , new Symbol(EQUAL_SIGN, '＝', "")
-                , new Symbol(GREATER_THAN_SIGN, '＞', ">")
+                , new Symbol(GREATER_THAN_SIGN, '＞', "")
                 , new Symbol(AT_MARK, '＠', "@")
                 , new Symbol(LEFT_SQUARE_BRACKET, '「', "")
                 , new Symbol(RIGHT_SQUARE_BRACKET, '」', "")

diff --git a/redpen-core/src/test/java/cc/redpen/validator/sentence/DoubledJoshiValidatorTest.java b/redpen-core/src/test/java/cc/redpen/validator/sentence/DoubledJoshiValidatorTest.java
@@ -55,14 +55,14 @@ public void testDetectDoubledJoshi() throws Exception {
     public void testNotDetectSingleJoshi() throws Exception {
         List<Document> documents = new ArrayList<>();
         documents.add(Document.builder(new JapaneseTokenizer())
-                .addSection(1)
-                .addParagraph()
-                .addSentence(new Sentence("私は彼が好き。", 1))
-                .build());
+                              .addSection(1)
+                              .addParagraph()
+                              .addSentence(new Sentence("私は彼が好き。", 1))
+                              .build());
 
         Configuration config = Configuration.builder("ja")
-                .addValidatorConfig(new ValidatorConfiguration("DoubledJoshi"))
-                .build();
+                                       .addValidatorConfig(new ValidatorConfiguration("DoubledJoshi"))
+                                       .build();
 
         RedPen redPen = new RedPen(config);
         Map<Document, List<ValidationError>> errors = redPen.validate(documents);

diff --git a/redpen-core/src/test/java/cc/redpen/validator/sentence/InvalidSymbolValidatorTest.java b/redpen-core/src/test/java/cc/redpen/validator/sentence/InvalidSymbolValidatorTest.java
@@ -146,4 +146,19 @@ public void testFloatingNumberInTheEndOfSentence() throws RedPenException {
         Map<Document, List<ValidationError>> errors = redPen.validate(documents);
         Assert.assertEquals(0, errors.get(documents.get(0)).size());
     }
+
+    @Test
+    public void testDefaultJapaneseSetting() throws Exception {
+        List<Document> documents = new ArrayList<>();
+        documents.add(Document.builder(new JapaneseTokenizer())
+                              .addSection(1)
+                              .addParagraph()
+                              .addSentence(new Sentence("Re:VIEW フォーマットが好きだ。", 1)).build());
+        Configuration config = Configuration.builder("ja")
+                               .addValidatorConfig(new ValidatorConfiguration("InvalidSymbol")).build();
+
+        RedPen redPen = new RedPen(config);
+        Map<Document, List<ValidationError>> errors = redPen.validate(documents);
+        assertEquals(0, errors.get(documents.get(0)).size());
+    }
 }