[isis] branch master updated: ISIS-2945: adds test to verify we properly parse simplified para. style

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new dfea03a  ISIS-2945: adds test to verify we properly parse simplified para. style
dfea03a is described below

commit dfea03a00067806efb180d8ae9b5e6338747ff04
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 19 18:15:51 2022 +0100

    ISIS-2945: adds test to verify we properly parse simplified para. style
---
 .../j2adoc/convert/J2AdocConverterDefault.java     |  6 +--
 .../tooling/j2adoc/convert/HtmlToAsciiDocTest.java | 59 ++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/convert/J2AdocConverterDefault.java b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/convert/J2AdocConverterDefault.java
index d48ce8b..677b267 100644
--- a/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/convert/J2AdocConverterDefault.java
+++ b/tooling/java2adoc/src/main/java/org/apache/isis/tooling/j2adoc/convert/J2AdocConverterDefault.java
@@ -51,10 +51,10 @@ import lombok.val;
 
 public final class J2AdocConverterDefault extends J2AdocConverterAbstract {
 
-    public static J2AdocConverter of(J2AdocContext j2AdocContext) {
+    public static J2AdocConverter of(final J2AdocContext j2AdocContext) {
         return new J2AdocConverterDefault(j2AdocContext);
     }
-    private J2AdocConverterDefault(J2AdocContext j2AdocContext) {
+    private J2AdocConverterDefault(final J2AdocContext j2AdocContext) {
         super(j2AdocContext);
     }
 
@@ -223,7 +223,7 @@ public final class J2AdocConverterDefault extends J2AdocConverterAbstract {
         return doc;
     }
 
-    private void appendBlocks(Mode mode, Document doc, List<StructuralNode> blocks) {
+    void appendBlocks(final Mode mode, final Document doc, final List<StructuralNode> blocks) {
         if (blocks.isEmpty()) {
             return;
         }
diff --git a/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/convert/HtmlToAsciiDocTest.java b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/convert/HtmlToAsciiDocTest.java
new file mode 100644
index 0000000..52d7fbe
--- /dev/null
+++ b/tooling/java2adoc/src/test/java/org/apache/isis/tooling/j2adoc/convert/HtmlToAsciiDocTest.java
@@ -0,0 +1,59 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.isis.tooling.j2adoc.convert;
+
+import org.jsoup.Jsoup;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.apache.isis.commons.collections.Can;
+import org.apache.isis.commons.internal.base._Text;
+import org.apache.isis.tooling.model4adoc.AsciiDocFactory;
+import org.apache.isis.tooling.model4adoc.AsciiDocWriter;
+
+import lombok.val;
+
+class HtmlToAsciiDocTest {
+
+    @BeforeEach
+    void setUp() throws Exception {
+    }
+
+    @Test
+    void simplifiedParagraphSyntax() {
+
+        val doc = AsciiDocFactory.doc();
+
+        // when
+        val descriptionAsHtml = Jsoup.parse("Hello<p>second paragraph<p>third paragraph");
+        val descriptionAdoc = HtmlToAsciiDoc.body(descriptionAsHtml.selectFirst("body"));
+
+        val blocks = descriptionAdoc.getBlocks();
+        doc.getBlocks().addAll(blocks);
+
+        // then we expect 3 paragraphs delimited by an empty line
+        final String adocAsString = AsciiDocWriter.toString(doc);
+        val lines = _Text.getLines(adocAsString).map(String::trim);
+
+        assertEquals(Can.of("Hello", "", "second paragraph", "", "third paragraph", ""), lines);
+    }
+
+}