Merge remote-tracking branch 'origin/version3' into feature/unit_tests

jgebal · jgebal · commit f2f954a8661c · 2016-08-17T00:08:23.000+01:00
diff --git a/source/types/ut_executable.tpb b/source/types/ut_executable.tpb
@@ -15,10 +15,8 @@ create or replace type body ut_executable is
   
     stmt := 'begin ' || ut_metadata.form_name(owner, object_name, procedure_name) || '; end;';
   
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_executable.execute_call stmt:' || stmt);
-    $end
-  
+    ut_utils.debug_log('ut_executable.execute_call stmt:' || stmt);
+
     i := dbms_sql.open_cursor;
     dbms_sql.parse(c => i, statement => stmt, language_flag => dbms_sql.native);
     c := dbms_sql.execute(i);
diff --git a/source/types/ut_test.tpb b/source/types/ut_test.tpb
@@ -42,9 +42,7 @@ create or replace type body ut_test is
     end if;
   
     begin
-      $if $$ut_trace $then
-      dbms_output.put_line('ut_test.execute');
-      $end
+      ut_utils.debug_log('ut_test.execute');
     
       self.start_time := current_timestamp;
     
@@ -60,10 +58,8 @@ create or replace type body ut_test is
             -- dbms_utility.format_error_backtrace is 10g or later
             -- utl_call_stack package may be better but it's 12c but still need to investigate
             -- article with details: http://www.oracle.com/technetwork/issue-archive/2014/14-jan/o14plsql-2045346.html
-            $if $$ut_trace $then
-            dbms_output.put_line('testmethod failed-' || sqlerrm(sqlcode) || ' ' ||
-                                 dbms_utility.format_error_backtrace);
-            $end
+            ut_utils.debug_log('testmethod failed-' || sqlerrm(sqlcode) || ' ' || dbms_utility.format_error_backtrace);
+
             ut_assert.report_error(sqlerrm(sqlcode) || ' ' || dbms_utility.format_error_backtrace);
         end;
 				
@@ -82,10 +78,7 @@ create or replace type body ut_test is
           --raise on ORA-04068: existing state of packages has been discarded to avoid unrecoverable session exception
           raise;
         end if;
-        $if $$ut_trace $then
-        dbms_output.put_line('ut_test.execute failed-' || sqlerrm(sqlcode) || ' ' ||
-                             dbms_utility.format_error_backtrace);
-        $end
+        ut_utils.debug_log('ut_test.execute failed-' || sqlerrm(sqlcode) || ' ' || dbms_utility.format_error_backtrace);
         -- most likely occured in setup or teardown if here.
         ut_assert.report_error(sqlerrm(sqlcode) || ' ' || dbms_utility.format_error_stack);
         ut_assert.report_error(sqlerrm(sqlcode) || ' ' || dbms_utility.format_error_backtrace);
diff --git a/source/types/ut_test_suite.tpb b/source/types/ut_test_suite.tpb
@@ -29,10 +29,8 @@ create or replace type body ut_test_suite is
       l_reporter.begin_suite(self);
     end if;
   
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_test_suite.execute');
-    $end
-  
+    ut_utils.debug_log('ut_test_suite.execute');
+
     self.start_time := current_timestamp;
   
     for i in self.items.first .. self.items.last loop
diff --git a/source/ut_assert.pkb b/source/ut_assert.pkb
@@ -4,21 +4,17 @@ create or replace package body ut_assert is
 
   function current_assert_test_result return integer is
   begin
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_assert.current_assert_test_result');
-    $end
-  
+    ut_utils.debug_log('ut_assert.current_assert_test_result');
+
     return get_assert_list_final_result(g_current_asserts_called);
   end;
 
   function get_assert_list_final_result(a_assert_list in ut_objects_list) return integer is
     l_result integer;
     l_assert ut_assert_result;
   begin
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_assert.get_assert_list_final_result');
-    $end
-  
+    ut_utils.debug_log('ut_assert.get_assert_list_final_result');
+
     if a_assert_list is not null then
     
       l_result := ut_utils.tr_success;
@@ -40,42 +36,31 @@ create or replace package body ut_assert is
 
   procedure clear_asserts is
   begin
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_assert.clear_asserts');
-    $end
-  
+    ut_utils.debug_log('ut_assert.clear_asserts');
     g_current_asserts_called.delete;
   end;
 
   procedure process_asserts(a_newtable out ut_objects_list) is
   begin
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_assert.copy_called_asserts');
-    $end
-  
+    ut_utils.debug_log('ut_assert.copy_called_asserts');
+
     a_newtable := ut_objects_list(); -- make sure new table is empty
     a_newtable.extend(g_current_asserts_called.last);
     for i in g_current_asserts_called.first .. g_current_asserts_called.last loop
-      $if $$ut_trace $then
-      dbms_output.put_line(i || '-start');
-      $end
-    
+      ut_utils.debug_log(i || '-start');
+
       a_newtable(i) := g_current_asserts_called(i);
     
-      $if $$ut_trace $then
-      dbms_output.put_line(i || '-end');
-      $end
+      ut_utils.debug_log(i || '-end');
     end loop;
-  
+
     clear_asserts;
   end process_asserts;
 
   procedure report_assert(a_assert_result in integer, a_message in varchar2) is
     l_result ut_assert_result;
   begin
-    $if $$ut_trace $then
-    dbms_output.put_line('ut_assert.report_assert :' || a_assert_result || ':' || a_message);
-    $end
+    ut_utils.debug_log('ut_assert.report_assert :' || a_assert_result || ':' || a_message);
     l_result := ut_assert_result(a_assert_result, a_message);
     g_current_asserts_called.extend;
     g_current_asserts_called(g_current_asserts_called.last) := l_result;
diff --git a/source/ut_utils.pkb b/source/ut_utils.pkb
@@ -10,5 +10,14 @@ create or replace package body ut_utils is
                 end;
   end test_result_to_char;
 
+  procedure debug_log(a_message varchar2) is
+  begin
+    $if $$ut_trace $then
+      dbms_output.put_line(a_message);
+    $else
+      null;
+    $end
+  end;
+
 end ut_utils;
 /
diff --git a/source/ut_utils.pks b/source/ut_utils.pks
@@ -31,5 +31,7 @@ create or replace package ut_utils is
   */
   function test_result_to_char(a_test_result integer) return varchar2;
 
+  procedure debug_log(a_message varchar2);
+
 end ut_utils;
 /

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,7 @@ create or replace package ut_utils is`
`31`	`31`	`*/`
`32`	`32`	`function test_result_to_char(a_test_result integer) return varchar2;`
`33`	`33`
	`34`	`+ procedure debug_log(a_message varchar2);`
	`35`	`+`
`34`	`36`	`end ut_utils;`
`35`	`37`	`/`