Merge pull request #1085 from utPLSQL/feature/fix_cdata_tagging

jgebal · web-flow · commit 20bf6dd614c2 · 2020-07-18T17:08:34.000+01:00
Fixed CDATA tagging in JUnit reporter
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -827,6 +827,9 @@ create or replace package body ut_utils is
   begin
     if a_clob is not null and a_clob != empty_clob() then
       l_result := replace( a_clob, gc_cdata_end_tag, gc_cdata_end_tag_wrap );
+      l_result := to_clob(gc_cdata_start_tag)
+        || replace( a_clob, gc_cdata_end_tag, gc_cdata_end_tag_wrap )
+        || to_clob(gc_cdata_end_tag);
     else
       l_result := a_clob;
     end if;
diff --git a/source/reporters/ut_realtime_reporter.tpb b/source/reporters/ut_realtime_reporter.tpb
@@ -252,7 +252,7 @@ create or replace type body ut_realtime_reporter is
   ) is
   begin
     if a_content is not null then
-       self.print_xml_fragment('<' || a_name || '><![CDATA[' || ut_utils.to_cdata(a_content) || ']]></' || a_name || '>');
+       self.print_xml_fragment('<' || a_name || '>' || ut_utils.to_cdata(a_content) || '</' || a_name || '>');
     end if;
   end print_cdata_node;
 
diff --git a/test/ut3_user/reporters/test_junit_reporter.pkb b/test/ut3_user/reporters/test_junit_reporter.pkb
@@ -15,6 +15,7 @@ create or replace package body test_junit_reporter as
       begin
         ut3_develop.ut.expect(1).to_equal(1);
         ut3_develop.ut.expect(1).to_equal(2);
+        dbms_output.put_line('<xml_tag><![CDATA[ and some raw CDATA <with_xml_tag/> ]]></xml_tag>');
       end;
 
     end;]';
@@ -87,6 +88,8 @@ create or replace package body test_junit_reporter as
     --Assert
     ut.expect(l_actual).not_to_be_like('%<tag>%');
     ut.expect(l_actual).to_be_like('%&lt;tag&gt;%');
+    ut.expect(l_actual).to_be_like(q'/%<![CDATA[<xml_tag><![CDATA[ and some raw CDATA <with_xml_tag/> ]]]]><![CDATA[></xml_tag>
+]]>%/');
   end;
 
   procedure reports_only_failed_or_errored is
