Skip to content

Commit e451e4b

Browse files
WayneNaniWayneNani
committed
Included print of serverout as comment
1 parent 55d5b61 commit e451e4b

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

‎source/reporters/ut_tap_reporter.tpb‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ create or replace type body ut_tap_reporter is
88
return;
99
end ut_tap_reporter;
1010

11+
member procedure print_comment(self in out nocopy ut_tap_reporter, a_comment clob) as
12+
begin
13+
self.print_clob(regexp_replace(a_comment, '^', '# ', 1, 0, 'm'));
14+
end print_comment;
15+
1116
overriding member procedure before_calling_suite(self in out nocopy ut_tap_reporter, a_suite ut_logical_suite) as
1217
begin
1318
self.print_text('# Subtest: ' || coalesce(a_suite.description, a_suite.name));
@@ -16,14 +21,6 @@ create or replace type body ut_tap_reporter is
1621
end before_calling_suite;
1722

1823

19-
overriding member procedure after_calling_before_test (self in out nocopy ut_tap_reporter, a_executable in ut_executable) as
20-
begin
21-
if a_executable.serveroutput is not null and a_executable.serveroutput != empty_clob() then
22-
self.print_clob('# ' || a_executable.serveroutput);
23-
end if;
24-
end after_calling_before_test;
25-
26-
2724
overriding member procedure after_calling_test(self in out nocopy ut_tap_reporter, a_test ut_test) as
2825
l_message varchar2(4000);
2926
l_test_name varchar2(4000) := coalesce(a_test.description, a_test.name);
@@ -72,6 +69,8 @@ create or replace type body ut_tap_reporter is
7269
self.print_text('...');
7370
self.lvl := self.lvl - 1;
7471
end if;
72+
73+
self.print_comment(a_test.get_serveroutputs);
7574

7675
end after_calling_test;
7776

‎source/reporters/ut_tap_reporter.tps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
create or replace type ut_tap_reporter under ut_documentation_reporter(
22

33
constructor function ut_tap_reporter(self in out nocopy ut_tap_reporter) return self as result,
4+
member procedure print_comment(self in out nocopy ut_tap_reporter, a_comment clob),
45
overriding member procedure before_calling_suite(self in out nocopy ut_tap_reporter, a_suite ut_logical_suite),
56

6-
overriding member procedure after_calling_before_test (self in out nocopy ut_tap_reporter, a_executable in ut_executable),
7-
87
overriding member procedure after_calling_test(self in out nocopy ut_tap_reporter, a_test ut_test),
8+
99
overriding member procedure after_calling_before_all (self in out nocopy ut_tap_reporter, a_executable in ut_executable),
1010
overriding member procedure after_calling_after_all (self in out nocopy ut_tap_reporter, a_executable in ut_executable),
1111
overriding member procedure before_calling_run(self in out nocopy ut_tap_reporter, a_run in ut_run),

‎test/ut3_user/reporters/test_tap_reporter.pkb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ create or replace package body test_tap_reporter as
66
l_output_data ut3_develop.ut_varchar2_list;
77
l_expected varchar2(32767);
88
begin
9-
l_expected := gc_boilerplate_suitepath_expression || '\s{21}1..1\s{21}# <!beforeall!>\s{21}# Subtest: A description of some context\s{25}1..1\s{25}# <!beforetest!>\s{25}ok - passing_test\s{21}# <!afterall!>\sok - org\s*';
9+
l_expected := gc_boilerplate_suitepath_expression || '\s{21}1..1\s{21}# <!beforeall!>\s{21}# Subtest: A description of some context\s{25}1..1\s{25}ok - passing_test\s{25}# <!beforeeach!>\s{25}# <!beforetest!>\s{25}# <!passing test!>\s{25}# <!aftertest!>\s{25}# <!aftereach!>\s{21}# <!afterall!>\sok - org\s*';
1010

1111
select *
1212
bulk collect into l_output_data
@@ -19,7 +19,7 @@ create or replace package body test_tap_reporter as
1919
l_output_data ut3_develop.ut_varchar2_list;
2020
l_expected varchar2(32767);
2121
begin
22-
l_expected := gc_boilerplate_suitepath_expression || q'[\s{21}1..1\s{21}# <!beforeall!>\s{21}not ok - a test with failing assertion\s{23}---\s{23}message: '"Fails as values are different"'\s{23}severity: fail\s{23}...\s{21}# <!afterall!>\snot ok - org\s*]';
22+
l_expected := gc_boilerplate_suitepath_expression || q'[\s{21}1..1\s{21}# <!beforeall!>\s{21}not ok - a test with failing assertion\s{23}---\s{23}message: '"Fails as values are different"'\s{23}severity: fail\s{23}...\s{21}# <!beforeeach!>\s{21}# <!failing test!>\s{21}# <!aftereach!>\s{21}# <!afterall!>\snot ok - org\s*]';
2323

2424
select *
2525
bulk collect into l_output_data
@@ -33,7 +33,7 @@ create or replace package body test_tap_reporter as
3333
l_output_data ut3_develop.ut_varchar2_list;
3434
l_expected varchar2(32767);
3535
begin
36-
l_expected := gc_boilerplate_suitepath_expression || q'[\s{21}1..1\s{21}# <!beforeall!>\s{21}not ok - a test raising unhandled exception\s{23}---\s{23}message: |\s{25ORA-06502: .*\s{25}ORA-06512: .*\s{25}ORA-06512: .*\s{25}ORA-06512: at line [[:digit:]]+\s{23}severity: error\s{23}...\s{21}# <!afterall!>\snot ok - org\s*]';
36+
l_expected := gc_boilerplate_suitepath_expression || q'[\s{21}1..1\s{21}# <!beforeall!>\s{21}not ok - a test raising unhandled exception\s{23}---\s{23}message: |\s{25ORA-06502: .*\s{25}ORA-06512: at line [[:digit:]]+\s{23}severity: error\s{23}...\s{21}# <!beforeeach!>\s{21}# <!erroring test!>\s{21}# <!aftereach!>\s{21}# <!afterall!>\snot ok - org\s*]';
3737

3838
select *
3939
bulk collect into l_output_data
@@ -75,7 +75,7 @@ create or replace package body test_tap_reporter as
7575
l_output_data ut3_develop.ut_varchar2_list;
7676
l_expected varchar2(32767);
7777
begin
78-
l_expected := q'[TAP version 14\s*1..1\s*# Subtest: org.*# Subtest: A suite for testing different outcomes from reporters\s{21}1..5\s{21}# <!beforeall!>\s{21}# Subtest: A description of some context\s{25}1..1\s{25}# <!beforetest!>\s{25}ok - passing_test\s{21}not ok - a test with failing assertion\s{23}---\s{23}message:.*not ok - a test raising unhandled exception\s{23}---\s{23}message: |.*ok - a disabled test # SKIP: Disabled for testing purpose.*ok - a disabled test with no reason # SKIP\s{21}# <!afterall!>\snot ok - org\s*]';
78+
l_expected := q'[TAP version 14\s*1..1\s*# Subtest: org.*# Subtest: A suite.*\s{21}1..5\s{21}# <!beforeall!>\s{21}# Subtest: A desc.*\s{25}1..1\s{25}ok - passing_test\s{25}# <!beforeeach!>\s{25}# <!beforet.*\s{25}# <!aftereach!>\s{21}not ok - a test w.*\s{23}---\s{23}message:.*\s{21}# <!beforeeach!>.*\s{21}# <!aftereach!>not ok - a test rai.*\s{23}---\s{23}message: |.*ok - a disabled test # SKIP: Disabled for testing purpose.*ok - a dis.* # SKIP\s{21}# <!afterall!>\snot ok - org\s*]';
7979

8080
select *
8181
bulk collect into l_output_data

0 commit comments

Comments
 (0)