optimizing

Issue imixs#212
NourEldin-Ali · Mar 11, 2023 · a6de4b9 · a6de4b9
1 parent 0921741
commit a6de4b9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/util/BPMNXMLUtil.java b/open-bpmn.metamodel/src/main/java/org/openbpmn/bpmn/util/BPMNXMLUtil.java
@@ -70,7 +70,7 @@ public static String cleanCDATAWhiteSpace(String xml) {
             if (pos > backwardTagPos - 1) {
                 xml = xml.substring(0, backwardTagPos + 1) + xml.substring(pos);
             }
-            lastPos = pos + 1;
+            lastPos = backwardTagPos + 9;
             /**
              * next search for
              * CDATA end ']]>'

diff --git a/open-bpmn.metamodel/src/test/java/org/openbpmn/output/TestCleanCDATA.java b/open-bpmn.metamodel/src/test/java/org/openbpmn/output/TestCleanCDATA.java
@@ -11,7 +11,31 @@ public class TestCleanCDATA {
     @Test
     public void testSimple() {
 
-        String xml = "<imixs:value>   \n  <![CDATA[ some data ]]>\n   </imixs:value>";
+        String xml = "<imixs:value>\n<![CDATA[ some data ]]>\n</imixs:value>";
+
+        System.out.println(xml);
+        String result = BPMNXMLUtil.cleanCDATAWhiteSpace(xml);
+
+        System.out.println(result);
+
+    }
+
+    @Test
+    public void testNoneWhitespace() {
+
+        String xml = "<imixs:value><![CDATA[ some data ]]></imixs:value>";
+
+        System.out.println(xml);
+        String result = BPMNXMLUtil.cleanCDATAWhiteSpace(xml);
+
+        System.out.println(result);
+
+    }
+
+    @Test
+    public void testMoreWhitespace() {
+
+        String xml = "<imixs:value>   \n                              <![CDATA[ some data ]]>\n     </imixs:value>";
 
         System.out.println(xml);
         String result = BPMNXMLUtil.cleanCDATAWhiteSpace(xml);