Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 9a0a729

Browse files
jgebaljgebal
authored
Merge pull request #669 from lwasylow/develop
Update issue with xml special chars in failure.
2 parents f59b62f + 5244887 commit 9a0a729

5 files changed

Lines changed: 6 additions & 16 deletions

File tree

‎source/reporters/ut_junit_reporter.tpb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,15 @@ create or replace type body ut_junit_reporter is
5353
self.print_text('</error>');
5454
elsif a_test.result > ut_utils.gc_success then
5555
self.print_text('<failure>');
56-
self.print_text(c_cddata_tag_start);
5756
for i in 1 .. a_test.failed_expectations.count loop
5857

5958
l_lines := a_test.failed_expectations(i).get_result_lines();
6059

6160
for j in 1 .. l_lines.count loop
6261
self.print_text(dbms_xmlgen.convert(l_lines(j)));
6362
end loop;
64-
self.print_text(a_test.failed_expectations(i).caller_info);
63+
self.print_text(dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info));
6564
end loop;
66-
self.print_text(c_cddata_tag_end);
6765
self.print_text('</failure>');
6866
end if;
6967
-- TODO - decide if we need/want to use the <system-err/> tag too

‎source/reporters/ut_sonar_test_reporter.tpb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,12 @@ create or replace type body ut_sonar_test_reporter is
5656
self.print_text('</error>');
5757
elsif a_test.result > ut_utils.gc_success then
5858
self.print_text('<failure message="some expectations have failed">');
59-
self.print_text('<![CDATA[');
6059
for i in 1 .. a_test.failed_expectations.count loop
6160
l_lines := a_test.failed_expectations(i).get_result_lines();
6261
for i in 1 .. l_lines.count loop
6362
self.print_text(dbms_xmlgen.convert(l_lines(i)));
6463
end loop;
6564
end loop;
66-
self.print_text(']]>');
6765
self.print_text('</failure>');
6866
end if;
6967
self.print_text('</testCase>');

‎source/reporters/ut_tfs_junit_reporter.tpb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,13 @@ create or replace type body ut_tfs_junit_reporter is
7676
-- Do not count error as failure
7777
elsif a_test.result = ut_utils.gc_failure then
7878
self.print_text('<failure type="failure" message="Test '||a_test.name||' failed">');
79-
self.print_text('<![CDATA[');
8079
for i in 1 .. a_test.failed_expectations.count loop
8180
l_lines := a_test.failed_expectations(i).get_result_lines();
8281
for j in 1 .. l_lines.count loop
8382
self.print_text(dbms_xmlgen.convert(l_lines(j)));
8483
end loop;
85-
self.print_text(a_test.failed_expectations(i).caller_info);
84+
self.print_text(dbms_xmlgen.convert(a_test.failed_expectations(i).caller_info));
8685
end loop;
87-
self.print_text(']]>');
8886
self.print_text('</failure>');
8987
end if;
9088

‎test/core/reporters/test_junit_reporter.pkb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ create or replace package body test_junit_reporter as
146146
from table(ut3.ut.run('check_junit_reporting',ut3.ut_junit_reporter()));
147147
l_actual := ut3.ut_utils.table_to_clob(l_results);
148148
--Assert
149-
ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %');
149+
ut.expect(l_actual).to_be_like('%at &quot;%.CHECK_JUNIT_REPORTING%&quot;, line %');
150150
end;
151151

152152
procedure check_classname_suite is
@@ -305,9 +305,7 @@ create or replace package body test_junit_reporter as
305305
from table(ut3.ut.run('check_fail_escape',ut3.ut_junit_reporter()));
306306
l_actual := ut3.ut_utils.table_to_clob(l_results);
307307
--Assert
308-
ut.expect(l_actual).to_be_like('%<![CDATA[%
309-
Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%
310-
]]>%');
308+
ut.expect(l_actual).to_be_like('%Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%');
311309
end;
312310

313311
procedure check_classname_is_populated is

‎test/core/reporters/test_tfs_junit_reporter.pkb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ create or replace package body test_tfs_junit_reporter as
108108
from table(ut3.ut.run('check_junit_reporting',ut3.ut_tfs_junit_reporter()));
109109
l_actual := ut3.ut_utils.table_to_clob(l_results);
110110
--Assert
111-
ut.expect(l_actual).to_be_like('%at "%.CHECK_JUNIT_REPORTING%", line %');
111+
ut.expect(l_actual).to_be_like('%at &quot;%.CHECK_JUNIT_REPORTING%&quot;, line %');
112112
end;
113113

114114
procedure check_classname_suite is
@@ -173,9 +173,7 @@ create or replace package body test_tfs_junit_reporter as
173173
from table(ut3.ut.run('check_fail_escape',ut3.ut_tfs_junit_reporter()));
174174
l_actual := ut3.ut_utils.table_to_clob(l_results);
175175
--Assert
176-
ut.expect(l_actual).to_be_like('%<![CDATA[%
177-
Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%
178-
]]>%');
176+
ut.expect(l_actual).to_be_like('%Actual: &apos;test&apos; (varchar2) was expected to equal: &apos;&lt;![CDATA[some stuff]]&gt;&apos; (varchar2)%');
179177
end;
180178

181179
procedure check_classname_suitepath is

0 commit comments

Comments
 (0)