Updated tests.

jgebal · jgebal · commit b8cd8784caaa · 2017-07-13T22:37:37.000+01:00
diff --git a/tests/ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql b/tests/ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql
@@ -1,26 +1,30 @@
 set termout off
-create or replace package tst_documrep_mult_warn as
+create or replace package ut_output_test_rollback as
   --%suite
 
+  --%beforeall
+  procedure ba;
+  --%beforeeach
+  procedure be;
   --%test
-  procedure test1;
-end;
-/
-
-create or replace package body tst_documrep_mult_warn as
-  procedure test1 is begin commit; end;
-end;
-/
-create or replace package tst_documrep_mult_warn2 as
-  --%suite
-
+  procedure test;
   --%test
-  procedure test1;
+  --%rollback(manual)
+  procedure t_manual;
+  --%afterall
+  procedure aa;
+  --%aftereach
+  procedure ae;
 end;
 /
 
-create or replace package body tst_documrep_mult_warn2 as
-  procedure test1 is begin commit; end;
+create or replace package body ut_output_test_rollback as
+ procedure ba is begin commit; end;
+ procedure be is begin commit; end;
+ procedure test is begin null; end;
+ procedure t_manual is begin commit; end;
+ procedure aa is begin commit; end;
+ procedure ae is begin commit; end;
 end;
 /
 
@@ -32,14 +36,31 @@ declare
   l_output            varchar2(32767);
   l_expected          varchar2(32767);
 begin
-  l_expected := q'[%Warnings:
-%1)%tst_documrep_mult_warn%
-%2)%tst_documrep_mult_warn%]';
+  l_expected := q'[%
+  1) ut_output_test_rollback.test
+      Unable to perform automatic rollback after test. An implicit or explicit commit/rollback occurred in procedures:
+        ut3.ut_output_test_rollback.be
+        ut3.ut_output_test_rollback.ae
+      Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.
+%
+  2) ut_output_test_rollback
+      Unable to perform automatic rollback after test suite. An implicit or explicit commit/rollback occurred in procedures:
+        ut3.ut_output_test_rollback.ba
+        ut3.ut_output_test_rollback.aa
+        ut3.ut_output_test_rollback.be
+        ut3.ut_output_test_rollback.ae
+        ut3.ut_output_test_rollback.be
+        ut3.ut_output_test_rollback.t_manual
+        ut3.ut_output_test_rollback.ae
+      Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.
+%
+Finished in % seconds
+2 tests, 0 failed, 0 errored, 0 disabled, 2 warning(s)%]';
 
   --act
   select *
   bulk collect into l_output_data
-  from table(ut.run(ut_varchar2_list('tst_documrep_mult_warn','tst_documrep_mult_warn2'),ut_documentation_reporter()));
+  from table(ut.run(ut_varchar2_list('ut_output_test_rollback'),ut_documentation_reporter()));
 
   l_output := ut_utils.table_to_clob(l_output_data);
 
@@ -48,9 +69,9 @@ begin
     :test_result := ut_utils.tr_success;
   else
     dbms_output.put_line('Actual:"'||l_output||'"');
+    dbms_output.put_line('Expected:"'||l_expected||'"');
   end if;
 end;
 /
 
-drop package tst_documrep_mult_warn;
-drop package tst_documrep_mult_warn2;
+drop package ut_output_test_rollback;
diff --git a/tests/ut_test/ut_test.ReportWarningOnRollbackFailed.sql b/tests/ut_test/ut_test.ReportWarningOnRollbackFailed.sql
@@ -29,9 +29,20 @@ begin
   l_results := ut_utils.table_to_clob(l_lines);
 
   --assert
-  if l_results like '%Warnings:%Unable to perform automatic rollback after test suite: ut_output_test_rollback%
-An implicit or explicit commit/rollback occurred.%
-Use the %rollback(manual) annotation or remove commits/rollback/ddl statements that are causing the issue.%0 disabled, 1 warning(s)%' then
+  if l_results like q'[%Warnings:
+%
+  1) ut_output_test_rollback.tt
+      Unable to perform automatic rollback after test. An implicit or explicit commit/rollback occurred in procedures:
+        ut3.ut_output_test_rollback.tt
+      Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.
+%
+  2) ut_output_test_rollback
+      Unable to perform automatic rollback after test suite. An implicit or explicit commit/rollback occurred in procedures:
+        ut3.ut_output_test_rollback.tt
+      Use the "--%rollback(manual)" annotation or remove commit/rollback/ddl statements that are causing the issue.
+%
+Finished in % seconds
+1 tests, 0 failed, 0 errored, 0 disabled, 2 warning(s)%]' then
     :test_result := ut_utils.tr_success;
   else
     for i in 1 .. l_lines.count loop
