Renamed ut_annotations to ut_annotation_parser and moved to annotations directory.

jgebal · jgebal · commit 58c62935a70a · 2017-10-07T15:59:55.000+01:00
diff --git a/old_tests/RunAll.sql b/old_tests/RunAll.sql
@@ -328,8 +328,8 @@ begin
     'source/api/ut_runner.pks',
     'source/core/coverage',
     'source/core/types',
-    'source/core/ut_annotations.pkb',
-    'source/core/ut_annotations.pks',
+    'source/core/ut_annotation_parser.pkb',
+    'source/core/ut_annotation_parser.pks',
     'source/core/ut_expectation_processor.pkb',
     'source/core/ut_expectation_processor.pks',
     'source/core/ut_file_mapper.pkb',
diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb
@@ -1,4 +1,4 @@
-create or replace package body ut_annotations as
+create or replace package body ut_annotation_parser as
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -338,5 +338,5 @@ create or replace package body ut_annotations as
     return l_annotation_params;
   end;
 
-end ut_annotations;
+end ut_annotation_parser;
 /
diff --git a/source/core/annotations/ut_annotation_parser.pks b/source/core/annotations/ut_annotation_parser.pks
@@ -1,4 +1,4 @@
-create or replace package ut_annotations authid current_user as
+create or replace package ut_annotation_parser authid current_user as
   /*
   utPLSQL - Version X.X.X.X
   Copyright 2016 - 2017 utPLSQL Project
@@ -17,7 +17,7 @@ create or replace package ut_annotations authid current_user as
   */
 
   /*
-    package: ut_annotations
+    package: ut_annotation_parser
 
     Responsible for parsing and accessing utplsql annotations.
 
@@ -100,5 +100,5 @@ create or replace package ut_annotations authid current_user as
   */
   function parse_annotation_params(a_annotation_text varchar2) return tt_annotation_params;
 
-end ut_annotations;
+end ut_annotation_parser;
 /
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
@@ -46,18 +46,18 @@ create or replace package body ut_suite_manager is
   end;
 
   function config_package(a_owner_name varchar2, a_object_name varchar2) return ut_logical_suite is
-    l_annotation_data    ut_annotations.typ_annotated_package;
-    l_suite_name         ut_annotations.t_annotation_name;
+    l_annotation_data    ut_annotation_parser.typ_annotated_package;
+    l_suite_name         ut_annotation_parser.t_annotation_name;
     l_test               ut_test;
-    l_proc_annotations   ut_annotations.tt_annotations;
+    l_proc_annotations   ut_annotation_parser.tt_annotations;
 
     l_default_setup_proc    varchar2(250 char);
     l_default_teardown_proc varchar2(250 char);
     l_suite_setup_proc      varchar2(250 char);
     l_suite_teardown_proc   varchar2(250 char);
     l_suite_path            varchar2(4000 char);
 
-    l_proc_name ut_annotations.t_procedure_name;
+    l_proc_name ut_annotation_parser.t_procedure_name;
 
     l_owner_name  varchar2(250 char);
     l_object_name varchar2(250 char);
@@ -76,7 +76,7 @@ create or replace package body ut_suite_manager is
       when e_insufficient_priv then
       return null;
     end;
-    l_annotation_data := ut_annotations.get_package_annotations(a_owner_name => l_owner_name, a_name => l_object_name);
+    l_annotation_data := ut_annotation_parser.get_package_annotations(a_owner_name => l_owner_name, a_name => l_object_name);
 
     if l_annotation_data.package_annotations.exists('suite') then
 
diff --git a/source/install.sql b/source/install.sql
@@ -75,8 +75,8 @@ alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6
 @@install_component.sql 'core/ut_output_buffer.pkb'
 
 --annoations
-@@install_component.sql 'core/ut_annotations.pks'
-@@install_component.sql 'core/ut_annotations.pkb'
+@@install_component.sql 'core/annotations/ut_annotation_parser.pks'
+@@install_component.sql 'core/annotations/ut_annotation_parser.pkb'
 
 --suite manager
 @@install_component.sql 'core/ut_suite_manager.pks'
diff --git a/source/uninstall.sql b/source/uninstall.sql
@@ -173,6 +173,7 @@ drop type ut_data_value force;
 drop table ut_cursor_data;
 
 drop package ut_annotations;
+drop package ut_annotation_parser;
 
 drop package ut_file_mapper;
 
diff --git a/test/install_tests.sql b/test/install_tests.sql
@@ -3,7 +3,7 @@ whenever oserror exit failure rollback
 
 @core.pks
 @ut_utils/test_ut_utils.pks
-@ut_annotations/test_annotations.pks
+@ut_annotation_parser/test_annotation_parser.pks
 @ut_matchers/test_matchers.pks
 @ut_output_buffer/test_output_buffer.pks
 @ut_suite_manager/test_suite_manager.pks
@@ -15,7 +15,7 @@ whenever oserror exit failure rollback
 
 @core.pkb
 @ut_utils/test_ut_utils.pkb
-@ut_annotations/test_annotations.pkb
+@ut_annotation_parser/test_annotation_parser.pkb
 @ut_matchers/test_matchers.pkb
 @ut_output_buffer/test_output_buffer.pkb
 @ut_suite_manager/test_suite_manager.pkb
diff --git a/test/ut_annotation_parser/test_annotation_parser.pkb b/test/ut_annotation_parser/test_annotation_parser.pkb
diff --git a/test/ut_annotation_parser/test_annotation_parser.pks b/test/ut_annotation_parser/test_annotation_parser.pks
