Added item_type attribute to output reporters.

Added missing items in uninstall.
utPLSQL · jgebal · Jan 1, 2019 · Dec 17, 2018 · Dec 17, 2018 · Dec 27, 2018
commit e02d238c2c2f271b63d785bd8f2d77ea8639dd1f
diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb
@@ -41,14 +41,19 @@ create or replace type body ut_output_reporter_base is
     l_output_table_buffer := treat(self.output_buffer as ut_output_table_buffer);
   end;
 
-  member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2) is
+  member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null) is
   begin
-    self.output_buffer.send_line(a_text);
+    self.output_buffer.send_line(a_text, a_item_type);
   end;
 
-  member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows) is
+  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
   begin
-    self.output_buffer.send_lines(a_text_lines);
+    self.output_buffer.send_lines(a_text_lines, a_item_type);
+  end;
+
+  member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null) is
+  begin
+    self.output_buffer.send_clob( a_clob, a_item_type );
   end;
 
   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
     self.output_buffer.lines_to_dbms_output(a_initial_timeout, a_timeout_sec);
   end;
 
-  member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob) is
-  begin
-    if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then
-      self.print_text_lines(
-        ut_utils.convert_collection( ut_utils.clob_to_table( a_clob, ut_utils.gc_max_storage_varchar2_len ) )
-        );
-    end if;
-  end;
-
   overriding final member procedure on_finalize(self in out nocopy ut_output_reporter_base, a_run in ut_run) is
   begin
     self.output_buffer.close();

diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps
@@ -21,9 +21,9 @@ create or replace type ut_output_reporter_base under ut_reporter_base(
   overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw),
   overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run),
 
-  member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2),
-  member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows),
-  member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob),
+  member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null),
+  member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null),
+  member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null),
 
   final member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined,
   final member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor,

diff --git a/source/reporters/ut_documentation_reporter.tpb b/source/reporters/ut_documentation_reporter.tpb
@@ -29,7 +29,7 @@ create or replace type body ut_documentation_reporter is
     return rpad(' ', self.lvl * 2);
   end tab;
 
-  overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob) is
+  overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob, a_item_type varchar2 := null) is
     l_lines     ut_varchar2_list;
     l_out_lines ut_varchar2_rows := ut_varchar2_rows();
   begin
@@ -40,17 +40,17 @@ create or replace type body ut_documentation_reporter is
           ut_utils.append_to_list(l_out_lines, tab() || l_lines(i) );
         end if;
       end loop;
-      (self as ut_output_reporter_base).print_text_lines(l_out_lines);
+      (self as ut_output_reporter_base).print_text_lines(l_out_lines, a_item_type);
     end if;
   end;
 
-  overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2) is
+  overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2, a_item_type varchar2 := null) is
     l_lines ut_varchar2_list;
   begin
     if a_text is not null then
       l_lines := ut_utils.string_to_table(a_text);
       for i in 1 .. l_lines.count loop
-        (self as ut_output_reporter_base).print_text(tab || l_lines(i));
+        (self as ut_output_reporter_base).print_text(tab || l_lines(i), a_item_type);
       end loop;
     end if;
   end;

diff --git a/source/reporters/ut_documentation_reporter.tps b/source/reporters/ut_documentation_reporter.tps
@@ -20,8 +20,8 @@ create or replace type ut_documentation_reporter under ut_console_reporter_base(
   constructor function ut_documentation_reporter(self in out nocopy ut_documentation_reporter) return self as result,
   member function tab(self in ut_documentation_reporter) return varchar2,
 
-  overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob),
-  overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2),
+  overriding member procedure print_clob(self in out nocopy ut_documentation_reporter, a_clob clob, a_item_type varchar2 := null),
+  overriding member procedure print_text(self in out nocopy ut_documentation_reporter, a_text varchar2, a_item_type varchar2 := null),
   overriding member procedure before_calling_suite(self in out nocopy ut_documentation_reporter, a_suite ut_logical_suite),
   overriding member procedure after_calling_test(self in out nocopy ut_documentation_reporter, a_test ut_test),
   overriding member procedure after_calling_after_all (self in out nocopy ut_documentation_reporter, a_executable in ut_executable),

diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql
@@ -241,6 +241,10 @@ drop table ut_output_buffer_info_tmp$;
 
 drop sequence ut_message_id_seq;
 
+drop type ut_output_data_rows force;
+
+drop type ut_output_data_row force;
+
 drop type ut_results_counter force;
 
 drop type ut_expectation_results force;