Remove a & from text

lwasylow · lwasylow · commit 97537de9629c · 2023-03-29T15:29:07.000-07:00
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -95,13 +95,10 @@ create or replace package body ut_runner is
     ut_event_manager.trigger_event(ut_event_manager.gc_initialize);
     ut_event_manager.trigger_event(ut_event_manager.gc_debug, ut_run_info());
 
-    --TODO:Verify tag tag expression is valid
-    /*
-    if regexp_like(l_tags,'[&|]{2,}|[!-]{2,}|[!-][&|]|[^-&|!,]+[-!]|[-!|&][)]')
-      or (regexp_count(l_tags,'\(') <> regexp_count(l_tags,'\)')) then
+    if ut_utils.valid_tag_expression(l_tags) = 0 then
       raise_application_error(ut_utils.gc_invalid_tag_expression, 'Invalid Tag expression');
     end if;
-    */
+
     if a_random_test_order_seed is not null then
       l_random_test_order_seed  := a_random_test_order_seed;
     elsif a_random_test_order then
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -1018,7 +1018,7 @@ create or replace package body ut_utils is
       l_right_side := regexp_replace(l_tags,l_left_side_regex,'\2');
       
       --If left side is null that means that we used left side operator without 
-      -- left and right e.g. &test
+      -- left and right e.g. |test
       if l_left_side is null then 
         l_result := 0;
       else
diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb
@@ -488,6 +488,33 @@ end;
   begin
     ut.expect(l_expected).to_equal(l_actual);
   end;   
+
+  procedure valid_tag_expressions is
+  begin
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|!tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1&!tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1|!tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2'));   
+
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1,-tag2'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('-tag1,-tag2'));
+      
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1|!tag2)|tag3'));
+    ut.expect(1).to_equal(ut3_develop.ut_utils.valid_tag_expression('(!tag1&!tag2)|(tag3&tag4)'));
+
+    ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('tag1|'));
+    ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('&!tag2'));
+    ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!!tag1|!tag2'));
+    ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('!tag1&!tag2|'));
+    ut.expect(0).to_equal(ut3_develop.ut_utils.valid_tag_expression('((!tag1|!tag2)|tag3'));
+
+  end;  
   
 end test_ut_utils;
 /
diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks
@@ -157,5 +157,8 @@ create or replace package test_ut_utils is
   
   --%endcontext
 
+  --%test(Test to validate different type of expressions passed as tags)  
+  procedure valid_tag_expressions;    
+
 end test_ut_utils;
 /

Original file line number	Diff line number	Diff line change
`@@ -157,5 +157,8 @@ create or replace package test_ut_utils is`
`157`	`157`
`158`	`158`	`--%endcontext`
`159`	`159`
	`160`	`+ --%test(Test to validate different type of expressions passed as tags)`
	`161`	`+ procedure valid_tag_expressions;`
	`162`	`+`
`160`	`163`	`end test_ut_utils;`
`161`	`164`	`/`