Reworking migration utility

jgebal · jgebal · commit d40d58dc0f3f · 2017-06-30T01:20:29.000+01:00
diff --git a/source/migration/ut3.ut_v2_migration.pkb b/source/migration/ut3.ut_v2_migration.pkb
@@ -1,5 +1,22 @@
 create or replace package body ut_v2_migration is
 
+  /*
+  utPLSQL v2 migration
+  Copyright 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+
   procedure upgrade_v2_package_spec(a_owner_name varchar2, a_packge_name varchar2, a_package_desc varchar2, a_package_prefix varchar2, a_parent_suite varchar2, a_compile_flag boolean) is
     l_resolved_owner       varchar2(128 char);
     l_resolved_object_name varchar2(128 char);
@@ -81,12 +98,7 @@ create or replace package body ut_v2_migration is
 
   end upgrade_v2_package_spec;
 
-  procedure migrate_v2_packages(a_compile_flag boolean default true) is
-  begin
-    migrate_v2_packages(a_owner_name => null, a_package_name => null, a_compile_flag => a_compile_flag);
-  end;
-
-  procedure migrate_v2_packages(a_owner_name varchar2, a_package_name varchar2 := null, a_compile_flag boolean := true) is
+  procedure migrate_v2_packages(a_owner_name varchar2 := null, a_package_name varchar2 := null, a_suite_name varchar2 := null, a_compile_flag boolean := true) is
     l_items_processed pls_integer := 0;
     l_items_succeeded pls_integer := 0;
     l_items_skipped pls_integer := 0;
@@ -119,6 +131,7 @@ create or replace package body ut_v2_migration is
                    and o.object_type in ('PACKAGE')
                    and p.owner = nvl(a_owner_name, p.owner)
                    and p.name = nvl(a_package_name, p.name)
+                   and (s.name = a_suite_name or a_suite_name is null)
                    and upper(p.name) like upper(nvl(p.prefix, c.prefix))||'%'
     ) loop
       begin
@@ -140,7 +153,7 @@ create or replace package body ut_v2_migration is
           if not a_compile_flag then
             dbms_output.put('--');
           end if;
-          dbms_output.put_line('INVALID package ' || rec.owner || '.' || rec.name ||  ' was skipped');
+          dbms_output.put_line('Package ' || rec.owner || '.' || rec.name ||  ' is in invalid state - skipping');
           l_items_skipped := l_items_skipped +1;
         end if;
 
@@ -177,5 +190,35 @@ create or replace package body ut_v2_migration is
 
   end;
 
+  procedure dry_run(a_owner varchar2, a_package varchar2 := null) is
+  begin
+    migrate_v2_packages(a_owner_name => a_owner, a_package_name => a_package, a_compile_flag => false);
+  end;
+
+  procedure dry_run_for_suite(a_suite_name varchar2) is
+  begin
+    migrate_v2_packages( a_suite_name => a_suite_name, a_compile_flag => false);
+  end;
+
+  procedure dry_run_all is
+  begin
+    migrate_v2_packages(a_compile_flag => false);
+  end;
+
+  procedure run(a_owner varchar2, a_package varchar2 := null) is
+  begin
+    migrate_v2_packages(a_owner_name => a_owner, a_package_name => a_package);
+  end;
+
+  procedure run_for_suite(a_suite_name varchar2) is
+  begin
+    migrate_v2_packages(a_suite_name => a_suite_name);
+  end;
+
+  procedure run_all is
+  begin
+    migrate_v2_packages();
+  end;
+
 end ut_v2_migration;
 /
diff --git a/source/migration/ut3.ut_v2_migration.pks b/source/migration/ut3.ut_v2_migration.pks
@@ -1,5 +1,22 @@
 create or replace package ut_v2_migration authid current_user is
 
+  /*
+  utPLSQL v2 migration
+  Copyright 2017 utPLSQL Project
+
+  Licensed under the Apache License, Version 2.0 (the "License"):
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  */
+
   /*
     procedure: upgrade_v2_package_spec
 
@@ -28,8 +45,13 @@ create or replace package ut_v2_migration authid current_user is
   ex_package_parsing_failed exception;
   pragma exception_init(ex_package_parsing_failed, -20401);
 
-  procedure migrate_v2_packages(a_owner_name varchar2, a_package_name varchar2 := null, a_compile_flag boolean := true);
-  procedure migrate_v2_packages(a_compile_flag boolean := true);
+  procedure dry_run(a_owner varchar2, a_package varchar2 := null);
+  procedure dry_run_for_suite(a_suite_name varchar2);
+  procedure dry_run_all;
+
+  procedure run(a_owner varchar2, a_package varchar2 := null);
+  procedure run_for_suite(a_suite_name varchar2);
+  procedure run_all;
 
 end ut_v2_migration;
 /
diff --git a/test/migration_test/test_migration.pkb b/test/migration_test/test_migration.pkb
@@ -8,44 +8,33 @@ begin
   end if;
   return substr( a_string, l_start_pos, a_end_pos - l_start_pos + 1);
 end;]';
-  gc_test_package varchar2(32767) := q'[create or replace package ut_betwnstr as
+  gc_ut_betwnstr_package varchar2(32767) := q'[create or replace package ut_betwnstr as
   procedure ut_setup;
   procedure ut_teardown;
   procedure ut_normal_case;
-  procedure ut_zero_start_position;
-  procedure ut_big_end_position;
-  procedure ut_null_string;
-  procedure ut_bad_params;
-  procedure ut_bad_test;
 end;
 ]';
-  gc_test_package_body varchar2(32767) := q'[create or replace package body ut_betwnstr as
+  gc_ut_betwnstr_body varchar2(32767) := q'[create or replace package body ut_betwnstr as
   procedure ut_setup is begin null; end;
   procedure ut_teardown is begin null; end;
   procedure ut_normal_case is
   begin
     utassert.eq( 'Returns substring from start position to end position',betwnstr( '1234567', 2, 5 ), '2345');
   end;
-  procedure ut_zero_start_position is
-  begin
-    utassert.eq( 'Returns substring when start position is zero', betwnstr( '1234567', 0, 5 ), '12345');
-  end;
-  procedure ut_big_end_position is
-  begin
-    utassert.eq( 'Returns string until end if end position is greater than string length', betwnstr( '1234567', 0, 500 ), '1234567') ;
-  end;
-  procedure ut_null_string is
-  begin
-    utassert.isnull( 'Returns null for null input string value', betwnstr( null, 2, 5 ) );
-  end;
-  procedure ut_bad_params is
-  begin
-    utassert.isnull( 'A demo of test raising runtime exception', betwnstr( '1234567', 'a', 'b' ) );
-  end;
-  procedure ut_bad_test
-  is
+end;
+]';
+  gc_ut_betwnstr_new_package varchar2(32767) := q'[create or replace package ut_betwnstr_new as
+  procedure ut_setup;
+  procedure ut_teardown;
+  procedure ut_normal_case;
+end;
+]';
+  gc_ut_betwnstr_new_body varchar2(32767) := q'[create or replace package body ut_betwnstr_new as
+  procedure ut_setup is begin null; end;
+  procedure ut_teardown is begin null; end;
+  procedure ut_normal_case is
   begin
-    utassert.eq( 'A demo of failing test', betwnstr( '1234567', 0, 500 ), '1');
+    utassert.eq( 'Returns substring from start position to end position',betwnstr( '1234567', 2, 5 ), '2345');
   end;
 end;
 ]';
@@ -60,63 +49,80 @@ end;
     ut3.ut_coverage.coverage_stop_develop();
   end;
 
-  procedure create_ut_v2_package is
+  procedure create_ut_v2_packages is
     pragma autonomous_transaction;
   begin
     execute immediate gc_tested_function;
-    execute immediate gc_test_package;
-    execute immediate gc_test_package_body;
+    execute immediate gc_ut_betwnstr_package;
+    execute immediate gc_ut_betwnstr_body;
+    execute immediate gc_ut_betwnstr_new_package;
+    execute immediate gc_ut_betwnstr_new_body;
+    dbms_output.put_line('create_ut_v2_packages');
   end;
 
-  procedure remove_ut_v2_execution is
+  procedure remove_ut_v2_executions is
+    pragma autonomous_transaction;
   begin
+    dbms_output.put_line('remove_ut_v2_executions');
     utpackage.rem(to_number(null),'UT_BETWNSTR');
+    utpackage.rem(to_number(null),'UT_BETWNSTR_NEW');
+    utSuite.rem('MIGRATION');
+    commit;
   end;
 
-  procedure drop_ut_v2_package is
+  procedure drop_ut_v2_packages is
     pragma autonomous_transaction;
-  begin
+    procedure exec(p_what varchar2) is
     begin
-      execute immediate q'[drop package ut_betwnstr]';
-    exception
-      when others then
-        null;
-    end;
-    begin
-      execute immediate q'[drop function betwnstr]';
+      execute immediate p_what;
     exception
       when others then
         null;
     end;
+
+  begin
+    dbms_output.put_line('drop_ut_v2_packages');
+    exec('drop package ut_betwnstr');
+    exec('drop package ut_betwnstr_new');
+    exec('drop function betwnstr');
+    remove_ut_v2_executions;
   end;
 
-  procedure execute_ut_v2_betwnstr is
+  procedure register_ut_v2_packages is
+    pragma autonomous_transaction;
   begin
+    dbms_output.put_line('register_ut_v2_packages');
     utplsql.run('UT_BETWNSTR');
+    utSuite.add ('MIGRATION');
+    utPackage.add('MIGRATION', 'UT_BETWNSTR_NEW');
+    utplsql.testsuite ('MIGRATION');
+    commit;
   end;
 
   procedure ut_v2_with_no_executions is
     pragma autonomous_transaction;
+    l_package clob;
   begin
     --act
-    ut_v2_migration.migrate_v2_packages(user);
+    ut_v2_migration.run(user);
     --assert
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).not_to_match('-- %suite');
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).not_to_match('-- %test');
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).not_to_match('-- %beforeall');
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).not_to_match('-- %afterall');
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR');
+    ut.expect( l_package ).not_to_match('-- %suite');
+    ut.expect( l_package ).not_to_match('-- %test');
+    ut.expect( l_package ).not_to_match('-- %beforeall');
+    ut.expect( l_package ).not_to_match('-- %afterall');
   end;
 
   procedure ut_v2_dropped_package is
     l_sqlcode integer;
     pragma autonomous_transaction;
   begin
     --arrange
-    drop_ut_v2_package;
+    drop_ut_v2_packages;
     --act
     begin
       dbms_output.disable;
-      ut_v2_migration.migrate_v2_packages(user);
+      ut_v2_migration.run(user);
       dbms_output.enable;
     exception
       when others then
@@ -125,16 +131,64 @@ end;
     ut.expect(l_sqlcode).to_be_null;
   end;
 
-  procedure ut_v2_migration_success is
+  procedure ut_v2_migration_one_pkg is
+    pragma autonomous_transaction;
+    l_package clob;
+  begin
+    --act
+    ut_v2_migration.run(user, 'UT_BETWNSTR');
+    --assert
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR');
+    ut.expect( l_package ).to_match('-- %suite');
+    ut.expect( l_package ).not_to_match('-- %suitepath');
+    ut.expect( l_package ).to_match('-- %test');
+    ut.expect( l_package ).to_match('-- %beforeall');
+    ut.expect( l_package ).to_match('-- %afterall');
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR_NEW');
+    ut.expect( l_package ).not_to_match('-- %suite');
+  end;
+
+  procedure ut_v2_migration_one_suite is
+    pragma autonomous_transaction;
+    l_package clob;
+  begin
+    --act
+    ut_v2_migration.run_for_suite('MIGRATION');
+    --assert
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR_NEW');
+    ut.expect( l_package ).to_match('-- %suite');
+    ut.expect( l_package ).to_match('-- %suitepath(MIGRATION)');
+    ut.expect( l_package ).to_match('-- %test');
+    ut.expect( l_package ).to_match('-- %beforeall');
+    ut.expect( l_package ).to_match('-- %afterall');
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR');
+    ut.expect( l_package ).not_to_match('-- %suite');
+  end;
+
+  procedure ut_v2_migration_one_schema is
+    pragma autonomous_transaction;
+    l_package clob;
+  begin
+    --act
+    ut_v2_migration.run(USER);
+    --assert
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR_NEW');
+    ut.expect( l_package ).to_match('-- %suite');
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR');
+    ut.expect( l_package ).to_match('-- %suite');
+  end;
+
+  procedure ut_v2_migration_all is
     pragma autonomous_transaction;
+    l_package clob;
   begin
     --act
-    ut_v2_migration.migrate_v2_packages(user);
+    ut_v2_migration.run_all;
     --assert
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).to_match('-- %suite');
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).to_match('-- %test');
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).to_match('-- %beforeall');
-    ut.expect( dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR') ).to_match('-- %afterall');
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR_NEW');
+    ut.expect( l_package ).to_match('-- %suite');
+    l_package := dbms_metadata.get_ddl('PACKAGE','UT_BETWNSTR');
+    ut.expect( l_package ).to_match('-- %suite');
   end;
 
 end;
diff --git a/test/migration_test/test_migration.pks b/test/migration_test/test_migration.pks
