From 5244887ba876e6459113dc9ba1ff24798caba3b0 Mon Sep 17 00:00:00 2001
From: lwasylow <lwasylow@gmail.com>
Date: Sat, 12 May 2018 15:20:30 +0100
Subject: [PATCH] Update issue with xml special chars in failure. Remove CDDATA
 and replace with xml convert

---
 source/reporters/ut_junit_reporter.tpb          | 4 +---
 source/reporters/ut_sonar_test_reporter.tpb     | 2 --
 source/reporters/ut_tfs_junit_reporter.tpb      | 4 +---
 test/core/reporters/test_junit_reporter.pkb     | 6 ++----
 test/core/reporters/test_tfs_junit_reporter.pkb | 6 ++----
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb
index 6c18463f6..5833b53c6 100644
--- a/source/reporters/ut_junit_reporter.tpb
+++ b/source/reporters/ut_junit_reporter.tpb
@@ -53,7 +53,6 @@ create or replace type body ut_junit_reporter is
         self.print_text('</error>');
       elsif a_test.result > ut_utils.gc_success then
         self.print_text('<failure>');
-        self.print_text(c_cddata_tag_start);
         for i in 1 .. a_test.failed_expectations.count loop
           
           l_lines := a_test.failed_expectations(i).get_result_lines();
@@ -61,9 +60,8 @@ create or replace type body ut_junit_reporter is
           for j in 1 .. l_lines.count loop
             self.print_text(dbms_xmlgen.convert(l_lines(j)));
           end loop;
-          self.print_text(a_test.failed_expectations(i).caller_info);
+          self.print_text(dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info));
         end loop;
-        self.print_text(c_cddata_tag_end);
         self.print_text('</failure>');
       end if;
       -- TODO - decide if we need/want to use the <system-err/> tag too
diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb
index ed73ea3de..1152c87d3 100644
--- a/source/reporters/ut_sonar_test_reporter.tpb
+++ b/source/reporters/ut_sonar_test_reporter.tpb
@@ -56,14 +56,12 @@ create or replace type body ut_sonar_test_reporter is
         self.print_text('</error>');
       elsif a_test.result > ut_utils.gc_success then
         self.print_text('<failure message="some expectations have failed">');
-        self.print_text('<![CDATA[');
         for i in 1 .. a_test.failed_expectations.count loop
           l_lines := a_test.failed_expectations(i).get_result_lines();
           for i in 1 .. l_lines.count loop
             self.print_text(dbms_xmlgen.convert(l_lines(i)));
           end loop;
         end loop;
-        self.print_text(']]>');
         self.print_text('</failure>');
       end if;
       self.print_text('</testCase>');
diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb
index b23bf2595..b2a777c9f 100644
--- a/source/reporters/ut_tfs_junit_reporter.tpb
+++ b/source/reporters/ut_tfs_junit_reporter.tpb
@@ -76,15 +76,13 @@ create or replace type body ut_tfs_junit_reporter is
      -- Do not count error as failure
       elsif a_test.result = ut_utils.gc_failure then
         self.print_text('<failure type="failure" message="Test '||a_test.name||' failed">');
-        self.print_text('<![CDATA[');
         for i in 1 .. a_test.failed_expectations.count loop
           l_lines := a_test.failed_expectations(i).get_result_lines();
           for j in 1 .. l_lines.count loop
             self.print_text(dbms_xmlgen.convert(l_lines(j)));
           end loop;
-          self.print_text(a_test.failed_expectations(i).caller_info);
+          self.print_text(dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info));
         end loop;
-        self.print_text(']]>');
         self.print_text('</failure>');
       end if;
 
diff --git a/test/core/reporters/test_junit_reporter.pkb b/test/core/reporters/test_junit_reporter.pkb
index bba6adc38..3e60b31c6 100644
--- a/test/core/reporters/test_junit_reporter.pkb
+++ b/test/core/reporters/test_junit_reporter.pkb
@@ -146,7 +146,7 @@ create or replace package body test_junit_reporter as
       from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
-    ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %');
+    ut.expect(l_actual).to_be_like('%at &quot;%.CHECK_JUNIT_REPORTING%&quot;, line %');
   end;
 
   procedure check_classname_suite is
@@ -305,9 +305,7 @@ create or replace package body test_junit_reporter as
       from table(ut3.ut.run('check_fail_escape',ut3.ut_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
-    ut.expect(l_actual).to_be_like('%<![CDATA[%
-Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%
-]]>%');
+    ut.expect(l_actual).to_be_like('%Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%');
   end;
   
   procedure check_classname_is_populated is
diff --git a/test/core/reporters/test_tfs_junit_reporter.pkb b/test/core/reporters/test_tfs_junit_reporter.pkb
index 8cecf2849..ff77cff5e 100644
--- a/test/core/reporters/test_tfs_junit_reporter.pkb
+++ b/test/core/reporters/test_tfs_junit_reporter.pkb
@@ -108,7 +108,7 @@ create or replace package body test_tfs_junit_reporter as
       from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
-    ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %');
+    ut.expect(l_actual).to_be_like('%at &quot;%.CHECK_JUNIT_REPORTING%&quot;, line %');
   end;
 
   procedure check_classname_suite is
@@ -173,9 +173,7 @@ create or replace package body test_tfs_junit_reporter as
       from table(ut3.ut.run('check_fail_escape',ut3.ut_tfs_junit_reporter()));
     l_actual := ut3.ut_utils.table_to_clob(l_results);
     --Assert
-    ut.expect(l_actual).to_be_like('%<![CDATA[%
-Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%
-]]>%');
+    ut.expect(l_actual).to_be_like('%Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%');
   end;
 
   procedure check_classname_suitepath is