Merge pull request #853 from utPLSQL/feature/fix_for_savepoints

jgebal · web-flow · commit b22b119a9980 · 2019-03-15T03:00:23.000+01:00
Feature/fix for savepoints
diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb
@@ -933,24 +933,25 @@ Failures:%
 
   procedure create_bad_annot is
     pragma autonomous_transaction;
-    begin
-      execute immediate q'[
-      create or replace package bad_annotations as
-        --%suite
+  begin
+    execute immediate q'[
+    create or replace package bad_annotations as
+      --%suite
 
-        --%context
+      --%context
 
-        --%test(invalidspecs)
-        procedure test1;
+      --%test(invalidspecs)
+      procedure test1;
 
-      end;]';
+    end;]';
 
-      execute immediate q'[
-      create or replace package body bad_annotations as
-        procedure test1 is begin ut.expect(1).to_equal(1); end;
-      end;]';
+    execute immediate q'[
+    create or replace package body bad_annotations as
+      procedure test1 is begin ut.expect(1).to_equal(1); end;
+    end;]';
+
+  end;
 
-    end;
   procedure drop_bad_annot is
     pragma autonomous_transaction;
   begin
diff --git a/test/core/min_grant_user/test_min_grant_user.pkb b/test/core/min_grant_user/test_min_grant_user.pkb
@@ -1,52 +1,5 @@
 create or replace package body test_min_grant_user is
 
-  procedure create_ut3$user#_tests is
-    pragma autonomous_transaction;
-  begin
-    execute immediate q'[
-      create or replace package ut3$user#.test_cursor_grants is
-        --%suite()
-
-        procedure run;
-
-        --%test(execute join by test)
-        procedure test_join_by_cursor;
-      end;
-      ]';
-    execute immediate q'[
-      create or replace package body ut3$user#.test_cursor_grants is
-        procedure run is
-        begin
-          ut3.ut.run('test_cursor_grants');
-        end;
-        procedure test_join_by_cursor is
-          l_actual   SYS_REFCURSOR;
-          l_expected SYS_REFCURSOR;
-        begin
-          --Arrange
-          open l_actual for select owner, object_name,object_type from all_objects where owner = user
-          order by 1,2,3 asc;
-          open l_expected for select owner, object_name,object_type from all_objects where owner = user
-          order by 1,2,3 desc;
-
-          --Act
-          ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER');
-
-        end;
-
-
-      end;
-      ]';
-  end;
-
-  procedure drop_ut3$user#_tests is
-    pragma autonomous_transaction;
-  begin
-    execute immediate q'[drop package ut3$user#.test_cursor_grants]';
-  end;
-
-
-
   procedure test_join_by_cursor is
     l_results clob;
   begin
diff --git a/test/core/min_grant_user/test_min_grant_user.pks b/test/core/min_grant_user/test_min_grant_user.pks
@@ -3,12 +3,6 @@ create or replace package test_min_grant_user is
   --%suite(minimum grant user tests)
   --%suitepath(utplsql.core)
 
-  --%beforeall
-  procedure create_ut3$user#_tests;
-
-  --%afterall
-  procedure drop_ut3$user#_tests;
-  
   --%test(execute join by test)
   procedure test_join_by_cursor;  
  
diff --git a/test/helpers/ut3user#.test_cursor_grants.pkb b/test/helpers/ut3user#.test_cursor_grants.pkb
@@ -0,0 +1,23 @@
+create or replace package body ut3$user#.test_cursor_grants is
+
+  procedure run is
+  begin
+    ut3.ut.run('test_cursor_grants');
+  end;
+
+  procedure test_join_by_cursor is
+    l_actual   SYS_REFCURSOR;
+    l_expected SYS_REFCURSOR;
+  begin
+    --Arrange
+    open l_actual for select owner, object_name,object_type from all_objects where owner = user
+                       order by 1,2,3 asc;
+    open l_expected for select owner, object_name,object_type from all_objects where owner = user
+                         order by 1,2,3 desc;
+
+    --Act
+    ut3.ut.expect(l_actual).to_equal(l_expected).join_by('OWNER');
+
+  end;
+end;
+/
diff --git a/test/helpers/ut3user#.test_cursor_grants.pks b/test/helpers/ut3user#.test_cursor_grants.pks
@@ -0,0 +1,9 @@
+create or replace package ut3$user#.test_cursor_grants is
+  --%suite()
+
+  procedure run;
+
+  --%test(execute join by test)
+  procedure test_join_by_cursor;
+end;
+/
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -15,6 +15,8 @@ alter session set plsql_optimize_level=0;
 @@helpers/test_dummy_object_list.tps
 @@helpers/test_event_object.tps
 @@helpers/test_event_list.tps
+@@helpers/ut3user#.test_cursor_grants.pks
+@@helpers/ut3user#.test_cursor_grants.pkb
 
 --Install tests
 @@core.pks
