.......... [ZBXNEXT-6547] updated from the latest feature/ZBXNEXT-6452-5.3 (no conflicts)

3 files changed, 42 insertions, 24 deletions

diff --git a/tests/libs/zbxcommon/zbx_token_find.yaml b/tests/libs/zbxcommon/zbx_token_find.yaml
index 798680d3e45..c09ddf73479 100644
--- a/tests/libs/zbxcommon/zbx_token_find.yaml
+++ b/tests/libs/zbxcommon/zbx_token_find.yaml
@@ -543,7 +543,7 @@ in:
 out:
   token: '{?{HOST.HOST}'
   token_type: ZBX_TOKEN_EXPRESSION_MACRO
-  expression: '{HOST.HOST'
+  expression: '{HOST.HOST}'
   return: SUCCEED
 ---
 test case: 'Success: {?{$MACRO}}'
diff --git a/tests/libs/zbxeval/zbx_eval_parse_expression.yaml b/tests/libs/zbxeval/zbx_eval_parse_expression.yaml
index 87fb3e59d80..bedecd798e8 100644
--- a/tests/libs/zbxeval/zbx_eval_parse_expression.yaml
+++ b/tests/libs/zbxeval/zbx_eval_parse_expression.yaml
@@ -994,9 +994,16 @@ out:
   - {type: ZBX_EVAL_TOKEN_OP_EQ, token: '=', opt: 0}
   result: SUCCEED
 --- # logical not
+test case: Fail 'not 1'
+in:
+  rules: [ZBX_EVAL_PARSE_VAR]
+  expression: 'not 1'
+out:
+  result: FAIL
+---  
 test case: Succeed 'not 1'
 in:
-  rules: [ZBX_EVAL_PARSE_MATH,ZBX_EVAL_PARSE_VAR,ZBX_EVAL_PARSE_GROUP,ZBX_EVAL_PARSE_COMPARE]
+  rules: [ZBX_EVAL_PARSE_VAR,ZBX_EVAL_PARSE_LOGIC]
   expression: 'not 1'
 out:
   stack:
@@ -1099,7 +1106,7 @@ out:
 --- # logical and/or
 test case: Succeed '1=2 or 3<4'
 in:
-  rules: [ZBX_EVAL_PARSE_VAR,ZBX_EVAL_PARSE_GROUP,ZBX_EVAL_PARSE_MATH,ZBX_EVAL_PARSE_COMPARE]
+  rules: [ZBX_EVAL_PARSE_VAR,ZBX_EVAL_PARSE_GROUP,ZBX_EVAL_PARSE_MATH,ZBX_EVAL_PARSE_COMPARE,ZBX_EVAL_PARSE_LOGIC]
   expression: '1=2 or 3<4'
 out:
   stack:
diff --git a/tests/libs/zbxserver/substitute_lld_macros.yaml b/tests/libs/zbxserver/substitute_lld_macros.yaml
index d1139293a8f..04d1726517a 100644
--- a/tests/libs/zbxserver/substitute_lld_macros.yaml
+++ b/tests/libs/zbxserver/substitute_lld_macros.yaml
@@ -1,38 +1,49 @@
 ---
-test case: Expand '={?{{HOST.KEY}:key[{#A}].last()}}=' with {#A}=[]
+test case: Expand '={?{last(/{HOST.KEY}/key[{#A}]}}=' with {#A}=[]
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"a":"[]"}'
   macros:
     - {macro: '{#A}', path: $.a}
-  expression: '={?{{HOST.HOST}:key[{#A}].last()}}='
+  expression: '={?{last(/{HOST.KEY}/key[{#A}]}}='
 out:
-  expression: '={?{{HOST.HOST}:key["[]"].last()}}='
+  expression: '={?{last(/{HOST.KEY}/key[[]]}}='
   return: SUCCEED
 ---
-test case: Expand 'Expression:{?{host:key.last()} = "{#A}" }.' with {#A}=value:"xyz"
+test case: Expand 'Expression:{?last(/host/key) = "{#A}" }.' with {#A}=value:"xyz"
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"a":"value:\"xyz\""}'
   macros:
     - {macro: '{#A}', path: $.a}
-  expression: 'Expression:{?{host:key.last()} = "{#A}" }.'
+  expression: 'Expression:{?last(/host/key) = "{#A}" }.'
 out:
-  expression: 'Expression:{?{host:key.last()} = "value:\"xyz\"" }.'
+  expression: 'Expression:{?last(/host/key) = "value:\"xyz\"" }.'
   return: SUCCEED
 ---
-test case: Expand '={?{host:key[{#A}].last({#A})}}=' with {#A}=()
+test case: Expand '={?last(/host/key[{#A}],,{#A})}=' with {#A}=()
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"a":"()"}'
   macros:
     - {macro: '{#A}', path: $.a}
-  expression: '={?{host:key[{#A}].last({#A})}}='
+  expression: '={?last(/host/key[{#A}],,{#A})}='
 out:
-  expression: '={?{host:key[()].last("()")}}='
+  expression: '={?last(/host/key[()],,"()")}='
   return: SUCCEED
 ---
-test case: Expand '{?{$MACRO:"{#A}"} {?{host:key[{#B1},{#B2}].last({#B1},{#B2})}}' with {#A}=x"z, {#B1}=[], {#B2}=()
+test case: Expand '={?func({#A})}=' with {#A}=()
+in:
+  flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
+  lld: '{"a":"()"}'
+  macros:
+    - {macro: '{#A}', path: $.a}
+  expression: '={?func({#A})}='
+out:
+  expression: '={?func("()")}='
+  return: SUCCEED
+---
+test case: Expand '{?{$MACRO:"{#A}"} {?last(/host/key[{#B1},{#B2}],{#B1},{#B2})}' with {#A}=x"z, {#B1}=[], {#B2}=()
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"a":"x\"z", "b1":"[]", "b2":"()"}'
@@ -40,43 +51,43 @@ in:
     - {macro: '{#A}', path: $.a}
     - {macro: '{#B1}', path: $.b1}
     - {macro: '{#B2}', path: $.b2}
-  expression: '{?{$MACRO:"{#A}"} {?{host:key[{#B1},{#B2}].last({#B1},{#B2})}}'
+  expression: '{?{$MACRO:"{#A}"} {?last(/host/key[{#B1},{#B2}],{#B1},{#B2})}'
 out:
-  expression: '{?{$MACRO:"x\"z"} {?{host:key["[]",()].last([],"()")}}'
+  expression: '{?{$MACRO:"x\"z"} {?last(/host/key["[]",()],[],"()")}'
   return: SUCCEED
 ---
-test case: Expand '{?{host:key[{#B1},{#B2}].last({#B1},{#B2})}} {host:key[{#B1},{#B2}].last({#B1},{#B2})}' with {#B1}=[], {#B2}=()
+test case: Expand '{?last(/host/key[{#B1},{#B2}],{#B1},{#B2})} last(/host/key[{#B1},{#B2}],{#B1},{#B2})' with {#B1}=[], {#B2}=()
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"b1":"[]", "b2":"()"}'
   macros:
     - {macro: '{#B1}', path: $.b1}
     - {macro: '{#B2}', path: $.b2}
-  expression: '{?{host:key[{#B1},{#B2}].last({#B1},{#B2})}} {host:key[{#B1},{#B2}].last({#B1},{#B2})}'
+  expression: '{?last(/host/key[{#B1},{#B2}],{#B1},{#B2})} last(/host/key[{#B1},{#B2}],{#B1},{#B2})'
 out:
-  expression: '{?{host:key["[]",()].last([],"()")}} {host:key[[],()].last([],())}'
+  expression: '{?last(/host/key["[]",()],[],"()")} last(/host/key[[],()],[],())'
   return: SUCCEED
 ---
-test case: Expand '{?{host:key[{#B1},{#B2}].last({#B1},{#B2})}} {?{host:key[{#B2},{#B1}].last({#B2},{#B1})}}' with {#B1}=[], {#B2}=()
+test case: Expand '{?last(/host/key[{#B1},{#B2}],{#B1},{#B2})} {?last(/host/key[{#B2},{#B1}],{#B2},{#B1})}' with {#B1}=[], {#B2}=()
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"b1":"[]", "b2":"()"}'
   macros:
     - {macro: '{#B1}', path: $.b1}
     - {macro: '{#B2}', path: $.b2}
-  expression: '{?{host:key[{#B1},{#B2}].last({#B1},{#B2})}} {?{host:key[{#B2},{#B1}].last({#B2},{#B1})}}'
+  expression: '{?last(/host/key[{#B1},{#B2}],{#B1},{#B2})} {?last(/host/key[{#B2},{#B1}],{#B2},{#B1})}'
 out:
-  expression: '{?{host:key["[]",()].last([],"()")}} {?{host:key[(),"[]"].last("()",[])}}'
+  expression: '{?last(/host/key["[]",()],[],"()")} {?last(/host/key[(),"[]"],(),"[]")}'
   return: SUCCEED
 ---
-test case: Expand 'Expression:{?{host:key.last()} = "{#A}" }.' with {#A}='= "xyz"'
+test case: Expand 'Expression:{?last(/host/key) {#A} }.' with {#A}='= "xyz"'
 in:
   flags: [ZBX_MACRO_ANY, ZBX_TOKEN_EXPRESSION_MACRO]
   lld: '{"a":"= \"xyz\""}'
   macros:
     - {macro: '{#A}', path: $.a}
-  expression: 'Expression:{?{host:key.last()} {#A} }.'
+  expression: 'Expression:{?last(/host/key) {#A} }.'
 out:
-  expression: 'Expression:{?{host:key.last()} = "xyz" }.'
+  expression: 'Expression:{?last(/host/key) = "xyz" }.'
   return: SUCCEED
 ...