Fixed double warning on missing endcontext annotation.

jgebal · jgebal · commit 75b96c321ab8 · 2018-03-29T15:27:13.000+01:00
Fixed tests.
diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb
@@ -480,8 +480,6 @@ create or replace package body ut_suite_builder is
     while l_context_pos is not null loop
       l_end_context_pos := get_endcontext_position(l_context_pos, a_package_ann_index);
       if l_end_context_pos is null then
-        a_suite.put_warning(
-          'Annotation "--%context('||a_annotations(l_context_pos).text||')" was ignored. Cannot find following "--%endcontext".');
         exit;
       end if;
 
@@ -554,7 +552,7 @@ create or replace package body ut_suite_builder is
       duplicate_annotations_warning(l_suite, l_package_ann_index, 'suite');
 
       add_suite_contexts( l_suite, l_annotations, l_package_ann_index );
-
+      --by this time all contexts were consumed and l_annotations should not have any context/endcontext annotation in it.
       warning_on_incomplete_context( l_suite, l_annotations, l_package_ann_index );
 
       populate_suite_contents( l_suite, l_annotations, l_package_ann_index );
diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb
@@ -366,14 +366,15 @@ create or replace package body test_suite_builder is
     ut.expect(l_actual).to_be_like(
         '%<UT_LOGICAL_SUITE><SELF_TYPE>UT_SUITE</SELF_TYPE><OBJECT_OWNER>UT3_TESTER</OBJECT_OWNER>' ||
         '<OBJECT_NAME>some_package</OBJECT_NAME><NAME>some_package</NAME><DESCRIPTION>Cool</DESCRIPTION>' ||
-        '%<WARNINGS><VARCHAR2>Annotations: &quot;--%afterall&quot;, &quot;--%aftereach&quot;, &quot;--%beforeall&quot;, &quot;--%beforeeach&quot;' ||
+        '%<WARNINGS><VARCHAR2>Annotations: &quot;--\%afterall&quot;, &quot;--\%aftereach&quot;, &quot;--\%beforeall&quot;, &quot;--\%beforeeach&quot;' ||
         ' were ignored for procedure &quot;DO_STUFF&quot;.' ||
         ' Those annotations cannot be used with annotation: &quot;--%test&quot;</VARCHAR2></WARNINGS>%'||
         '%<UT_SUITE_ITEM>%<OBJECT_NAME>some_package</OBJECT_NAME>%<NAME>do_stuff</NAME>' ||
         '%<BEFORE_EACH_LIST/>' ||
         '%<AFTER_EACH_LIST/>' ||
         '%<BEFORE_ALL_LIST/>' ||
         '%<AFTER_ALL_LIST/>%'
+        ,'\'
     );
   end;
 
@@ -440,7 +441,7 @@ create or replace package body test_suite_builder is
     --Assert
     ut.expect(l_actual).to_be_like(
         '%<UT_LOGICAL_SUITE>' ||
-        '%<WARNINGS><VARCHAR2>Annotation &quot;--%context(A context)&quot; was ignored. Cannot find following &quot;--%endcontext&quot;.</VARCHAR2></WARNINGS>' ||
+        '%<WARNINGS><VARCHAR2>Annotation &quot;--\%context(A context)&quot; was ignored. Cannot find following &quot;--\%endcontext&quot;.</VARCHAR2></WARNINGS>' ||
         '%<ITEMS>' ||
         '<UT_SUITE_ITEM>' ||
         '%<NAME>suite_level_test</NAME><DESCRIPTION>In suite</DESCRIPTION><PATH>some_package.suite_level_test</PATH>' ||
@@ -455,6 +456,7 @@ create or replace package body test_suite_builder is
         '%</BEFORE_ALL_LIST>' ||
         '<AFTER_ALL_LIST/>' ||
         '</UT_LOGICAL_SUITE>'
+        ,'\'
     );
   end;
 
@@ -478,7 +480,7 @@ create or replace package body test_suite_builder is
     --Assert
     ut.expect(l_actual).to_be_like(
       '%<UT_LOGICAL_SUITE>' ||
-        '%<WARNINGS><VARCHAR2>Annotation &quot;--%endcontext&quot; was ignored. Cannot find preceding &quot;--%context&quot;.</VARCHAR2></WARNINGS>' ||
+        '%<WARNINGS><VARCHAR2>Annotation &quot;--\%endcontext&quot; was ignored. Cannot find preceding &quot;--\%context&quot;.</VARCHAR2></WARNINGS>' ||
         '%<ITEMS>' ||
           '<UT_SUITE_ITEM>' ||
             '%<NAME>context_1</NAME><DESCRIPTION>A context</DESCRIPTION><PATH>some_package.context_1</PATH>' ||
@@ -501,6 +503,7 @@ create or replace package body test_suite_builder is
         '%</BEFORE_ALL_LIST>' ||
         '<AFTER_ALL_LIST/>' ||
       '</UT_LOGICAL_SUITE>'
+      ,'\'
     );
   end;
 
