Update tests and code

utPLSQL · jgebal · Apr 28, 2023 · Mar 28, 2023 · Mar 28, 2023 · Mar 29, 2023
commit bf6959fc63c4c36ff24f62d28e8a5b1d6b323ce4
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
@@ -1000,24 +1000,30 @@ create or replace package body ut_utils is
    return l_result;
  end;

+  function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list is
+    l_tags_tokens ut_varchar2_list := ut_varchar2_list();  
+  begin
+    --Tokenize a string into operators and tags
+    select regexp_substr(a_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts
+    bulk collect into l_tags_tokens
+    from dual connect by regexp_substr (a_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null;
+
+    return l_tags_tokens;
+  end;
+
  /*
    https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression
  */
  function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list is
    l_tags varchar2(32767) := a_tags;
    l_operator_stack ut_stack := ut_stack();
-    l_input_tokens ut_varchar2_list := ut_varchar2_list();
+    l_input_tokens ut_varchar2_list := tokenize_tags_string(a_tags);
    l_rnp_tokens ut_varchar2_list := ut_varchar2_list();
    l_token varchar2(32767);
    l_expect_operand boolean := true;
    l_expect_operator boolean := false;
    l_idx pls_integer;
  begin    
-    --Tokenize a string into operators and tags
-    select regexp_substr(l_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts
-    bulk collect into l_input_tokens
-    from dual connect by regexp_substr (l_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null;
-
    l_idx := l_input_tokens.first;
    --Exuecute modified shunting algorithm
    WHILE (l_idx is not null) loop
@@ -1071,7 +1077,7 @@ create or replace package body ut_utils is
      l_idx := l_input_tokens.next(l_idx);
    end loop;

-    while l_operator_stack.top > 0 loop
+    while l_operator_stack.peek is not null loop
        if l_operator_stack.peek in ('(',')') then 
          raise ex_invalid_tag_expression;
        end if;         
@@ -1082,12 +1088,6 @@ create or replace package body ut_utils is
    return l_rnp_tokens;
  end shunt_logical_expression;

-  procedure shunt_logical_expression(a_tags in varchar2) is
-    a_postfix ut_varchar2_list;
-  begin
-     a_postfix := ut_utils.shunt_logical_expression(a_tags);
-  end shunt_logical_expression;
-
  function convert_postfix_to_infix(a_postfix_exp in ut_varchar2_list) 
    return varchar2 is
    l_infix_stack ut_stack := ut_stack();
@@ -1112,8 +1112,6 @@ create or replace package body ut_utils is
        l_left_side := l_infix_stack.pop;
        l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')';
        l_infix_stack.push(l_infix_exp);
-      else
-        null;
      end if;
      l_idx := a_postfix_exp.next(l_idx);
    end loop;
@@ -1149,8 +1147,6 @@ create or replace package body ut_utils is
        l_left_side := l_infix_stack.pop;
        l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')';
        l_infix_stack.push(l_infix_exp);
-      else
-        null;
      end if;
      l_idx := a_postfix_exp.next(l_idx);
    end loop;

diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -476,6 +476,11 @@ create or replace package ut_utils authid definer is
  * Return value of interval in plain english
  */    
  function interval_to_text(a_interval yminterval_unconstrained) return varchar2;
+
+  /*
+  * Return table of tokens character by character
+  */   
+  function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list;

  /*
  * Function that uses Dijkstra algorithm to parse mathematical and logical expression
@@ -484,8 +489,6 @@ create or replace package ut_utils authid definer is
  */
  function shunt_logical_expression(a_tags in varchar2) return ut_varchar2_list;

-  procedure shunt_logical_expression(a_tags in varchar2);
-
  /*
  * Function that converts postfix notation into infix
  */

diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb
@@ -504,7 +504,11 @@ end;

    l_postfix := ut3_develop.ut_utils.shunt_logical_expression('(a|b)|c&d');
    l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,'');
-    ut.expect(l_postfix_string).to_equal('ab|cd&|');        
+    ut.expect(l_postfix_string).to_equal('ab|cd&|');     
+
+    l_postfix := ut3_develop.ut_utils.shunt_logical_expression('!a|b');
+    l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,'');
+    ut.expect(l_postfix_string).to_equal('a!b|');         
  end;

  procedure test_conv_from_rpn_to_infix is
@@ -521,7 +525,28 @@ end;

    l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','|','c','d','&','|');
    l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn);
-    ut.expect(l_infix_string).to_equal('((a|b)|(c&d))');        
+    ut.expect(l_infix_string).to_equal('((a|b)|(c&d))');  
+
+    l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|');
+    l_infix_string := ut3_develop.ut_utils.convert_postfix_to_infix(l_postfix_rpn);
+    ut.expect(l_infix_string).to_equal('(a|(!b))');          
+  end;
+
+  procedure conv_from_rpn_to_sql_filter is
+    l_postfix_rpn ut3_develop.ut_varchar2_list;
+    l_infix_string varchar2(4000);
+  begin
+    l_postfix_rpn := ut3_develop.ut_varchar2_list('A');
+    l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn);
+    ut.expect(l_infix_string).to_equal(q'['A' member of tags]');
+
+    l_postfix_rpn := ut3_develop.ut_varchar2_list('A','B','|');
+    l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn);
+    ut.expect(l_infix_string).to_equal(q'[('A' member of tags|'B' member of tags)]');
+
+    l_postfix_rpn := ut3_develop.ut_varchar2_list('a','b','!','|');
+    l_infix_string := ut3_develop.ut_utils.conv_postfix_to_infix_sql(l_postfix_rpn);
+    ut.expect(l_infix_string).to_equal(q'[('a' member of tags|!('b' member of tags))]');  
  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
@@ -163,5 +163,8 @@ create or replace package test_ut_utils is
  --%test( Test conversion of expression from Reverse Polish Notation into infix)
  procedure test_conv_from_rpn_to_infix;

+  --%test( Test conversion of expression from Reverse Polish Notation into custom where filter for SQL)
+  procedure conv_from_rpn_to_sql_filter;  
+
 end test_ut_utils;
 /
diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb
@@ -1260,7 +1260,20 @@ procedure tag_exclude_run_fun_pth_lst_lg is

    l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end|)');
    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');  
-    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');    
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');   
+
+    l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&!!end_to_end)');
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');  
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');  
+
+    l_results := ut3_tester_helper.run_helper.run(a_tags => '(&development&end_to_end)');
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');  
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%'); 
+
+    l_results := ut3_tester_helper.run_helper.run(a_tags => '(development|end_to_end))');
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');  
+    ut.expect(  ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');     
+
  end;

  procedure set_application_info is