Added self_type to ut_suite_item_base.

jgebal · jgebal · commit 333e749ff8b6 · 2017-01-07T16:11:25.000Z
Refactored ut_output to use the same naming for attribute (self_type)
diff --git a/source/core/types/ut_output.tpb b/source/core/types/ut_output.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_output as
 
   final member function generate_output_id return varchar2 is
   begin
-    return output_type||'-'||userenv('sessionid')||'-'||ut_utils.to_string(cast(current_timestamp as timestamp));
+    return self.self_type||'-'||userenv('sessionid')||'-'||ut_utils.to_string(cast(current_timestamp as timestamp));
   end;
 
 end;
diff --git a/source/core/types/ut_output.tps b/source/core/types/ut_output.tps
@@ -1,5 +1,5 @@
 create or replace type ut_output as object (
-  output_type varchar2(128),
+  self_type varchar2(128),
   output_id   varchar2(128),
   final member function generate_output_id return varchar2,
   not instantiable member procedure open(self in out nocopy ut_output),
diff --git a/source/core/types/ut_output_dbms_output.tpb b/source/core/types/ut_output_dbms_output.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_output_dbms_output as
 
   constructor function ut_output_dbms_output(self in out nocopy ut_output_dbms_output) return self as result is
   begin
-    self.output_type := $$plsql_unit;
+    self.self_type := $$plsql_unit;
     self.output_id := self.generate_output_id();
     return;
   end;
diff --git a/source/core/types/ut_output_dbms_pipe.tpb b/source/core/types/ut_output_dbms_pipe.tpb
@@ -2,7 +2,7 @@ create or replace type body ut_output_dbms_pipe as
 
   constructor function ut_output_dbms_pipe(self in out nocopy ut_output_dbms_pipe) return self as result is
   begin
-    self.output_type := $$plsql_unit;
+    self.self_type := $$plsql_unit;
     self.output_id := self.generate_output_id;
     return;
   end;
diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb
@@ -2,6 +2,7 @@ create or replace type body ut_run as
 
   constructor function ut_run( self in out nocopy ut_run, a_items ut_suite_items ) return self as result is
   begin
+    self.self_type := $$plsql_unit;
     self.items := a_items;
     return;
   end;
diff --git a/source/core/types/ut_suite.tpb b/source/core/types/ut_suite.tpb
@@ -6,6 +6,7 @@ create or replace type body ut_suite as
     a_after_all_proc_name varchar2 := null, a_before_each_proc_name varchar2 := null, a_after_each_proc_name varchar2 := null
   ) return self as result is
   begin
+    self.self_type := $$plsql_unit;
     self.init(a_object_owner, a_object_name, a_name, a_description, a_path, a_rollback_type, a_ignore_flag);
     self.before_all := ut_executable(self, a_before_all_proc_name, ut_utils.gc_before_all);
     self.before_each := ut_executable(self, a_before_each_proc_name, ut_utils.gc_before_each);
diff --git a/source/core/types/ut_suite_item_base.tps b/source/core/types/ut_suite_item_base.tps
@@ -4,7 +4,7 @@ create or replace type ut_suite_item_base as object (
   * Object type is a pre-declaration to be referenced by ut_event_listener_base
   * The true abstract type is ut_suite_item
   */
-
+  self_type    varchar2(250 byte),
   /**
   * owner of the database object (package)
   */
diff --git a/source/core/types/ut_test.tpb b/source/core/types/ut_test.tpb
@@ -5,6 +5,7 @@ create or replace type body ut_test as
     a_path varchar2 := null, a_rollback_type integer := null, a_ignore_flag boolean := false, a_before_test_proc_name varchar2 := null, a_after_test_proc_name varchar2 := null
   ) return self as result is
   begin
+    self.self_type := $$plsql_unit;
     self.init(a_object_owner, a_object_name, a_name, a_description, a_path, a_rollback_type, a_ignore_flag);
     self.before_test := ut_executable(self, a_before_test_proc_name, ut_utils.gc_before_test);
     self.item := ut_executable(self, a_name, ut_utils.gc_test_execute);
