Skip to content

Commit e02d238

Browse files
jgebaljgebal
committed
Added item_type attribute to output reporters.
Added missing items in uninstall.
1 parent 8f5b736 commit e02d238

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎source/core/types/ut_output_reporter_base.tpb‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,19 @@ create or replace type body ut_output_reporter_base is
4141
l_output_table_buffer := treat(self.output_buffer as ut_output_table_buffer);
4242
end;
4343

44-
member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2) is
44+
member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null) is
4545
begin
46-
self.output_buffer.send_line(a_text);
46+
self.output_buffer.send_line(a_text, a_item_type);
4747
end;
4848

49-
member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows) is
49+
member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null) is
5050
begin
51-
self.output_buffer.send_lines(a_text_lines);
51+
self.output_buffer.send_lines(a_text_lines, a_item_type);
52+
end;
53+
54+
member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null) is
55+
begin
56+
self.output_buffer.send_clob( a_clob, a_item_type );
5257
end;
5358

5459
final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural) return ut_output_data_rows pipelined is
@@ -68,15 +73,6 @@ create or replace type body ut_output_reporter_base is
6873
self.output_buffer.lines_to_dbms_output(a_initial_timeout, a_timeout_sec);
6974
end;
7075

71-
member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob) is
72-
begin
73-
if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then
74-
self.print_text_lines(
75-
ut_utils.convert_collection( ut_utils.clob_to_table( a_clob, ut_utils.gc_max_storage_varchar2_len ) )
76-
);
77-
end if;
78-
end;
79-
8076
overriding final member procedure on_finalize(self in out nocopy ut_output_reporter_base, a_run in ut_run) is
8177
begin
8278
self.output_buffer.close();

‎source/core/types/ut_output_reporter_base.tps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ create or replace type ut_output_reporter_base under ut_reporter_base(
2121
overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw),
2222
overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run),
2323

24-
member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2),
25-
member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows),
26-
member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob),
24+
member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null),
25+
member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null),
26+
member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null),
2727

2828
final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined,
2929
final member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor,

‎source/reporters/ut_documentation_reporter.tpb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ create or replace type body ut_documentation_reporter is
2929
return rpad(' ', self.lvl * 2);
3030
end tab;
3131

32-
overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob) is
32+
overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob, a_item_type varchar2 := null) is
3333
l_lines ut_varchar2_list;
3434
l_out_lines ut_varchar2_rows := ut_varchar2_rows();
3535
begin
@@ -40,17 +40,17 @@ create or replace type body ut_documentation_reporter is
4040
ut_utils.append_to_list(l_out_lines, tab() || l_lines(i) );
4141
end if;
4242
end loop;
43-
(self as ut_output_reporter_base).print_text_lines(l_out_lines);
43+
(self as ut_output_reporter_base).print_text_lines(l_out_lines, a_item_type);
4444
end if;
4545
end;
4646

47-
overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2) is
47+
overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2, a_item_type varchar2 := null) is
4848
l_lines ut_varchar2_list;
4949
begin
5050
if a_text is not null then
5151
l_lines := ut_utils.string_to_table(a_text);
5252
for i in 1 .. l_lines.count loop
53-
(self as ut_output_reporter_base).print_text(tab || l_lines(i));
53+
(self as ut_output_reporter_base).print_text(tab || l_lines(i), a_item_type);
5454
end loop;
5555
end if;
5656
end;

‎source/reporters/ut_documentation_reporter.tps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ create or replace type ut_documentation_reporter under ut_console_reporter_base(
2020
constructor function ut_documentation_reporter(self in out nocopy ut_documentation_reporter) return self as result,
2121
member function tab(self in ut_documentation_reporter) return varchar2,
2222

23-
overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob),
24-
overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2),
23+
overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob, a_item_type varchar2 := null),
24+
overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2, a_item_type varchar2 := null),
2525
overriding member procedure before_calling_suite(self in out nocopy ut_documentation_reporter, a_suite ut_logical_suite),
2626
overriding member procedure after_calling_test(self in out nocopy ut_documentation_reporter, a_test ut_test),
2727
overriding member procedure after_calling_after_all (self in out nocopy ut_documentation_reporter, a_executable in ut_executable),

‎source/uninstall_objects.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,10 @@ drop table ut_output_buffer_info_tmp$;
241241

242242
drop sequence ut_message_id_seq;
243243

244+
drop type ut_output_data_rows force;
245+
246+
drop type ut_output_data_row force;
247+
244248
drop type ut_results_counter force;
245249

246250
drop type ut_expectation_results force;

0 commit comments

Comments
 (0)