Merge pull request #846 from utPLSQL/feature/fix_annotation_parsing

Fixed annotations on CANADIAN FRENCH NLS settings
utPLSQL · Mar 5, 2019 · 07f5fed · 07f5fed
2 parents 5c1f193 + 9334747
commit 07f5fed
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 9 deletions.
diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb
@@ -19,13 +19,13 @@ create or replace package body ut_annotation_parser as
   ------------------------------
   --private definitions
 
-  type tt_comment_list is table of varchar2(32767) index by pls_integer;
+  type tt_comment_list is table of varchar2(32767) index by binary_integer;
 
   gc_annotation_qualifier        constant varchar2(1) := '%';
   gc_annot_comment_pattern       constant varchar2(30) := '^( |'||chr(09)||')*-- *('||gc_annotation_qualifier||'.*?)$'; -- chr(09) is a tab character
   gc_comment_replacer_patter     constant varchar2(50) := '{COMMENT#%N%}';
   gc_comment_replacer_regex_ptrn constant varchar2(25) := '{COMMENT#(\d+)}';
-  gc_regexp_identifier           constant varchar2(50) := '[a-z][a-z0-9#_$]*';
+  gc_regexp_identifier           constant varchar2(50) := '[a-zA-Z][a-zA-Z0-9#_$]*';
   gc_annotation_block_pattern    constant varchar2(200) := '(({COMMENT#.+}'||chr(10)||')+)( |'||chr(09)||')*(procedure|function)\s+(' ||
                                                            gc_regexp_identifier || ')';
   gc_annotation_pattern          constant varchar2(50) := gc_annotation_qualifier || gc_regexp_identifier || '[ '||chr(9)||']*(\(.*?\)\s*?$)?';
@@ -46,10 +46,7 @@ create or replace package body ut_annotation_parser as
     if l_annotation_str is not null then
 
       -- get the annotation name and it's parameters if present
-      l_annotation_name := lower(regexp_substr(l_annotation_str
-                                               ,'%(' || gc_regexp_identifier || ')'
-                                               ,modifier => 'i'
-                                               ,subexpression => 1));
+      l_annotation_name := lower(regexp_substr(l_annotation_str ,'%(' || gc_regexp_identifier || ')', subexpression => 1));
       l_annotation_text := trim(regexp_substr(l_annotation_str, '\((.*?)\)\s*$', subexpression => 1));
 
       a_annotations.extend;
@@ -59,7 +56,7 @@ create or replace package body ut_annotation_parser as
   end;
 
   procedure delete_processed_comments( a_comments in out nocopy tt_comment_list, a_annotations ut_annotations ) is
-    l_loop_index       pls_integer := 1;
+    l_loop_index       binary_integer := 1;
   begin
     l_loop_index := a_annotations.first;
     while l_loop_index is not null loop
@@ -74,8 +71,8 @@ create or replace package body ut_annotation_parser as
     a_comments tt_comment_list,
     a_subobject_name varchar2 := null
   ) is
-    l_loop_index       pls_integer := 1;
-    l_annotation_index pls_integer;
+    l_loop_index       binary_integer := 1;
+    l_annotation_index binary_integer;
   begin
     -- loop while there are unprocessed comment blocks
     while 0 != nvl(regexp_instr(srcstr        => a_source

diff --git a/test/core/annotations/test_annotation_parser.pkb b/test/core/annotations/test_annotation_parser.pkb
@@ -414,6 +414,48 @@ END;';
     ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected));
   end;
 
+  procedure test_upper_annot is
+    l_source    clob;
+    l_actual    ut3.ut_annotations;
+    l_expected  ut3.ut_annotations;
+  begin
+    l_source := 'PACKAGE test_tt AS
+    -- %SUITE
+    -- %DISPLAYNAME(Name of suite)
+    -- %SUITEPATH(all.globaltests)
+
+    -- %ANN1(Name of suite)
+    -- %ANN2(all.globaltests)
+
+    --%TEST
+    procedure foo;
+
+    -- %ANN3(Name of suite)
+    -- %ANN4(all.globaltests)
+
+    --%TEST
+    procedure bar;
+  END;';
+
+    --Act
+    l_actual := ut3.ut_annotation_parser.parse_object_annotations(l_source);
+
+    --Assert
+    l_expected := ut3.ut_annotations(
+      ut3.ut_annotation( 2, 'suite', null, null ),
+      ut3.ut_annotation( 3, 'displayname', 'Name of suite', null ),
+      ut3.ut_annotation( 4, 'suitepath', 'all.globaltests', null ),
+      ut3.ut_annotation( 6, 'ann1', 'Name of suite', null ),
+      ut3.ut_annotation( 7, 'ann2', 'all.globaltests', null ),
+      ut3.ut_annotation( 9, 'test', null, 'foo'),
+      ut3.ut_annotation( 12, 'ann3', 'Name of suite', null ),
+      ut3.ut_annotation( 13, 'ann4', 'all.globaltests', null ),
+      ut3.ut_annotation( 15, 'test', null, 'bar')
+      );
+
+    ut.expect(anydata.convertCollection(l_actual)).to_equal(anydata.convertCollection(l_expected));
+
+  end;
 
 end test_annotation_parser;
 /
diff --git a/test/core/annotations/test_annotation_parser.pks b/test/core/annotations/test_annotation_parser.pks
@@ -35,5 +35,8 @@ create or replace package test_annotation_parser is
   -- %test(Parses annotations with very long object names)
   procedure test_annot_very_long_name;
 
+  -- %test(Parses upper case annotations)
+  procedure test_upper_annot;
+
 end test_annotation_parser;
 /