Add cap <br> to convert #24

(cherry picked from commit 5b31fd6)
ikeyat · Feb 8, 2019 · 29a23ab · 29a23ab
1 parent b377cc8
commit 29a23ab
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/tool/src/main/java/jp/ikeyat/tools/javadoc2xls/report/converter/RemoveHtmlConverter.java b/tool/src/main/java/jp/ikeyat/tools/javadoc2xls/report/converter/RemoveHtmlConverter.java
@@ -4,6 +4,8 @@ public class RemoveHtmlConverter implements Converter {
     public String convert(String source) {
         source = source.replaceAll("<br>", "\r\n");
         source = source.replaceAll("<br */>", "\r\n");
+        source = source.replaceAll("<BR>", "\r\n");
+        source = source.replaceAll("<BR */>", "\r\n");
         source = source.replaceAll("<[^<>]*>", "");
         return source;
     }

diff --git a/tool/src/test/java/jp/ikeyat/tools/javadoc2xls/report/converter/RemoveHtmlConverterTest.java b/tool/src/test/java/jp/ikeyat/tools/javadoc2xls/report/converter/RemoveHtmlConverterTest.java
@@ -27,6 +27,28 @@ public void testBrReplaced_003() {
         assertThat(result, is("hoge\r\nfuga"));
     }
 
+    @Test
+    public void testBrReplaced_004() {
+        Converter converter = new RemoveHtmlConverter();
+        String result = converter.convert("hoge<BR>fuga");
+        assertThat(result, is("hoge\r\nfuga"));
+    }
+
+    @Test
+    public void testBrReplaced_005() {
+        Converter converter = new RemoveHtmlConverter();
+        String result = converter.convert("hoge<BR/>fuga");
+        assertThat(result, is("hoge\r\nfuga"));
+    }
+
+    @Test
+    public void testBrReplaced_006() {
+        Converter converter = new RemoveHtmlConverter();
+        String result = converter.convert("hoge<BR />fuga");
+        assertThat(result, is("hoge\r\nfuga"));
+    }
+
+
     @Test
     public void testTagRemoved_001() {
         Converter converter = new RemoveHtmlConverter();