pytest-dsl 0.1.1__py3-none-any.whl → 0.2.0__py3-none-any.whl

pytest_dsl/core/parser.py

@@ -46,13 +46,16 @@ def p_metadata_item(p):
                     | TAGS_KEYWORD COLON LBRACKET tags RBRACKET
                     | AUTHOR_KEYWORD COLON metadata_value
                     | DATE_KEYWORD COLON DATE
-                    | DATA_KEYWORD COLON data_source'''
+                    | DATA_KEYWORD COLON data_source
+                    | IMPORT_KEYWORD COLON STRING'''
     if p[1] == '@tags':
         p[0] = Node(p[1], value=p[4])
     elif p[1] == '@data':
         # 对于数据驱动测试，将数据源信息存储在节点中
         data_info = p[3]  # 这是一个包含 file 和 format 的字典
         p[0] = Node(p[1], value=data_info, children=None)
+    elif p[1] == '@import':
+        p[0] = Node(p[1], value=p[3])
     else:
         p[0] = Node(p[1], value=p[3])
 
@@ -90,7 +93,9 @@ def p_statements(p):
 def p_statement(p):
     '''statement : assignment
                 | keyword_call
-                | loop'''
+                | loop
+                | custom_keyword
+                | return_statement'''
     p[0] = p[1]
 
 
@@ -185,6 +190,44 @@ def p_data_source(p):
     p[0] = {'file': p[1], 'format': p[3]}
 
 
+def p_custom_keyword(p):
+    '''custom_keyword : KEYWORD_KEYWORD ID LPAREN param_definitions RPAREN DO statements END'''
+    p[0] = Node('CustomKeyword', [p[4], p[7]], p[2])
+
+
+def p_param_definitions(p):
+    '''param_definitions : param_def_list
+                        | '''
+    if len(p) == 2:
+        p[0] = p[1]
+    else:
+        p[0] = []
+
+
+def p_param_def_list(p):
+    '''param_def_list : param_def COMMA param_def_list
+                     | param_def'''
+    if len(p) == 4:
+        p[0] = [p[1]] + p[3]
+    else:
+        p[0] = [p[1]]
+
+
+def p_param_def(p):
+    '''param_def : ID EQUALS STRING
+                | ID EQUALS NUMBER
+                | ID'''
+    if len(p) == 4:
+        p[0] = Node('ParameterDef', [Node('Expression', value=p[3])], p[1])
+    else:
+        p[0] = Node('ParameterDef', [], p[1])
+
+
+def p_return_statement(p):
+    '''return_statement : RETURN expression'''
+    p[0] = Node('Return', [p[2]])
+
+
 def p_error(p):
     if p:
         print(

pytest_dsl/core/parsetab.py

@@ -6,9 +6,9 @@ _tabversion = '3.10'
 
 _lr_method = 'LALR'
 
-_lr_signature = 'leftCOMMArightEQUALSAUTHOR_KEYWORD COLON COMMA DATA_KEYWORD DATE DATE_KEYWORD DESCRIPTION_KEYWORD DO END EQUALS FALSE FOR ID IN LBRACKET LPAREN NAME_KEYWORD NUMBER PLACEHOLDER RANGE RBRACKET RPAREN STRING TAGS_KEYWORD TEARDOWN_KEYWORD TRUE USINGstart : metadata statements teardown\n             | metadata statementsmetadata : metadata_itemsmetadata_items : metadata_item metadata_items\n                     | metadata_itemmetadata_item : NAME_KEYWORD COLON metadata_value\n                    | DESCRIPTION_KEYWORD COLON metadata_value\n                    | TAGS_KEYWORD COLON LBRACKET tags RBRACKET\n                    | AUTHOR_KEYWORD COLON metadata_value\n                    | DATE_KEYWORD COLON DATE\n                    | DATA_KEYWORD COLON data_sourcemetadata_value : STRING\n                     | IDtags : tag COMMA tags\n            | tagtag : STRING\n           | IDstatements : statement statements\n                  | statementstatement : assignment\n                | keyword_call\n                | loopassignment : ID EQUALS expression\n                 | ID EQUALS keyword_callexpression : NUMBER\n                  | STRING\n                  | PLACEHOLDER\n                  | ID\n                  | boolean_expr\n                  | list_exprboolean_expr : TRUE\n                    | FALSElist_expr : LBRACKET list_items RBRACKET\n                 | LBRACKET RBRACKETlist_items : list_item\n                  | list_item COMMA list_itemslist_item : expressionloop : FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements ENDkeyword_call : LBRACKET ID RBRACKET COMMA parameter_list\n                   | LBRACKET ID RBRACKETparameter_list : parameter_itemsparameter_items : parameter_item COMMA parameter_items\n                     | parameter_itemparameter_item : ID COLON expressionteardown : TEARDOWN_KEYWORD DO statements ENDdata_source : STRING USING ID'
+_lr_signature = 'leftCOMMArightEQUALSAUTHOR_KEYWORD COLON COMMA DATA_KEYWORD DATE DATE_KEYWORD DESCRIPTION_KEYWORD DO END EQUALS FALSE FOR ID IMPORT_KEYWORD IN KEYWORD_KEYWORD LBRACKET LPAREN NAME_KEYWORD NUMBER PLACEHOLDER RANGE RBRACKET RETURN RPAREN STRING TAGS_KEYWORD TEARDOWN_KEYWORD TRUE USINGstart : metadata statements teardown\n             | metadata statementsmetadata : metadata_itemsmetadata_items : metadata_item metadata_items\n                     | metadata_itemmetadata_item : NAME_KEYWORD COLON metadata_value\n                    | DESCRIPTION_KEYWORD COLON metadata_value\n                    | TAGS_KEYWORD COLON LBRACKET tags RBRACKET\n                    | AUTHOR_KEYWORD COLON metadata_value\n                    | DATE_KEYWORD COLON DATE\n                    | DATA_KEYWORD COLON data_source\n                    | IMPORT_KEYWORD COLON STRINGmetadata_value : STRING\n                     | IDtags : tag COMMA tags\n            | tagtag : STRING\n           | IDstatements : statement statements\n                  | statementstatement : assignment\n                | keyword_call\n                | loop\n                | custom_keyword\n                | return_statementassignment : ID EQUALS expression\n                 | ID EQUALS keyword_callexpression : NUMBER\n                  | STRING\n                  | PLACEHOLDER\n                  | ID\n                  | boolean_expr\n                  | list_exprboolean_expr : TRUE\n                    | FALSElist_expr : LBRACKET list_items RBRACKET\n                 | LBRACKET RBRACKETlist_items : list_item\n                  | list_item COMMA list_itemslist_item : expressionloop : FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements ENDkeyword_call : LBRACKET ID RBRACKET COMMA parameter_list\n                   | LBRACKET ID RBRACKETparameter_list : parameter_itemsparameter_items : parameter_item COMMA parameter_items\n                     | parameter_itemparameter_item : ID COLON expressionteardown : TEARDOWN_KEYWORD DO statements ENDdata_source : STRING USING IDcustom_keyword : KEYWORD_KEYWORD ID LPAREN param_definitions RPAREN DO statements ENDparam_definitions : param_def_list\n                        | param_def_list : param_def COMMA param_def_list\n                     | param_defparam_def : ID EQUALS STRING\n                | ID EQUALS NUMBER\n                | IDreturn_statement : RETURN expression'
     
-_lr_action_items = {'NAME_KEYWORD':([0,4,32,33,34,35,37,38,39,69,71,],[5,5,-6,-12,-13,-7,-9,-10,-11,-8,-46,]),'DESCRIPTION_KEYWORD':([0,4,32,33,34,35,37,38,39,69,71,],[6,6,-6,-12,-13,-7,-9,-10,-11,-8,-46,]),'TAGS_KEYWORD':([0,4,32,33,34,35,37,38,39,69,71,],[7,7,-6,-12,-13,-7,-9,-10,-11,-8,-46,]),'AUTHOR_KEYWORD':([0,4,32,33,34,35,37,38,39,69,71,],[8,8,-6,-12,-13,-7,-9,-10,-11,-8,-46,]),'DATE_KEYWORD':([0,4,32,33,34,35,37,38,39,69,71,],[9,9,-6,-12,-13,-7,-9,-10,-11,-8,-46,]),'DATA_KEYWORD':([0,4,32,33,34,35,37,38,39,69,71,],[10,10,-6,-12,-13,-7,-9,-10,-11,-8,-46,]),'$end':([1,11,12,13,14,15,26,28,42,43,44,45,46,47,48,49,51,52,53,63,72,73,76,77,78,85,86,92,],[0,-2,-19,-20,-21,-22,-1,-18,-28,-23,-24,-25,-26,-27,-29,-30,-31,-32,-40,-34,-45,-33,-39,-41,-43,-44,-42,-38,]),'ID':([2,3,4,12,13,14,15,17,18,19,20,21,23,29,32,33,34,35,36,37,38,39,41,42,43,44,45,46,47,48,49,50,51,52,53,59,61,63,67,69,70,71,73,74,76,77,78,79,82,83,85,86,87,90,92,],[16,-3,-5,16,-20,-21,-22,30,31,-4,34,34,34,42,-6,-12,-13,-7,58,-9,-10,-11,16,-28,-23,-24,-25,-26,-27,-29,-30,62,-31,-32,-40,71,42,-34,75,-8,58,-46,-33,42,-39,-41,-43,42,42,75,-44,-42,42,16,-38,]),'LBRACKET':([2,3,4,12,13,14,15,19,22,29,32,33,34,35,37,38,39,41,42,43,44,45,46,47,48,49,50,51,52,53,61,63,69,71,73,74,76,77,78,79,82,85,86,87,90,92,],[17,-3,-5,17,-20,-21,-22,-4,36,50,-6,-12,-13,-7,-9,-10,-11,17,-28,-23,-24,-25,-26,-27,-29,-30,61,-31,-32,-40,61,-34,-8,-46,-33,61,-39,-41,-43,61,61,-44,-42,61,17,-38,]),'FOR':([2,3,4,12,13,14,15,19,32,33,34,35,37,38,39,41,42,43,44,45,46,47,48,49,51,52,53,63,69,71,73,76,77,78,85,86,90,92,],[18,-3,-5,18,-20,-21,-22,-4,-6,-12,-13,-7,-9,-10,-11,18,-28,-23,-24,-25,-26,-27,-29,-30,-31,-32,-40,-34,-8,-46,-33,-39,-41,-43,-44,-42,18,-38,]),'COLON':([5,6,7,8,9,10,75,],[20,21,22,23,24,25,82,]),'TEARDOWN_KEYWORD':([11,12,13,14,15,28,42,43,44,45,46,47,48,49,51,52,53,63,73,76,77,78,85,86,92,],[27,-19,-20,-21,-22,-18,-28,-23,-24,-25,-26,-27,-29,-30,-31,-32,-40,-34,-33,-39,-41,-43,-44,-42,-38,]),'END':([12,13,14,15,28,42,43,44,45,46,47,48,49,51,52,53,60,63,73,76,77,78,85,86,91,92,],[-19,-20,-21,-22,-18,-28,-23,-24,-25,-26,-27,-29,-30,-31,-32,-40,72,-34,-33,-39,-41,-43,-44,-42,92,-38,]),'EQUALS':([16,],[29,]),'STRING':([20,21,23,25,29,36,50,61,70,74,79,82,87,],[33,33,33,40,46,57,46,46,57,46,46,46,46,]),'DATE':([24,],[38,]),'DO':([27,89,],[41,90,]),'NUMBER':([29,50,61,74,79,82,87,],[45,45,45,45,45,45,45,]),'PLACEHOLDER':([29,50,61,74,79,82,87,],[47,47,47,47,47,47,47,]),'TRUE':([29,50,61,74,79,82,87,],[51,51,51,51,51,51,51,]),'FALSE':([29,50,61,74,79,82,87,],[52,52,52,52,52,52,52,]),'RBRACKET':([30,42,45,46,47,48,49,50,51,52,55,56,57,58,61,62,63,64,65,66,73,80,81,],[53,-28,-25,-26,-27,-29,-30,63,-31,-32,69,-15,-16,-17,63,53,-34,73,-35,-37,-33,-14,-36,]),'IN':([31,],[54,]),'USING':([40,],[59,]),'COMMA':([42,45,46,47,48,49,51,52,53,56,57,58,62,63,65,66,73,78,84,85,],[-28,-25,-26,-27,-29,-30,-31,-32,67,70,-16,-17,-28,-34,74,-37,-33,83,87,-44,]),'RPAREN':([42,45,46,47,48,49,51,52,63,73,88,],[-28,-25,-26,-27,-29,-30,-31,-32,-34,-33,89,]),'RANGE':([54,],[68,]),'LPAREN':([68,],[79,]),}
+_lr_action_items = {'NAME_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[5,5,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'DESCRIPTION_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[6,6,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'TAGS_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[7,7,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'AUTHOR_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[8,8,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'DATE_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[9,9,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'DATA_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[10,10,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'IMPORT_KEYWORD':([0,4,49,50,51,52,54,55,56,58,85,87,],[11,11,-6,-13,-14,-7,-9,-10,-11,-12,-8,-49,]),'$end':([1,12,13,14,15,16,17,18,32,34,39,40,41,42,43,44,45,46,47,60,61,63,67,83,88,90,91,92,106,107,111,115,],[0,-2,-20,-21,-22,-23,-24,-25,-1,-19,-58,-28,-29,-30,-31,-32,-33,-34,-35,-26,-27,-43,-37,-36,-48,-42,-44,-46,-47,-45,-50,-41,]),'ID':([2,3,4,13,14,15,16,17,18,20,21,22,23,24,25,26,28,35,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,58,59,60,61,62,63,65,67,74,77,83,84,85,86,87,90,91,92,93,96,99,100,104,106,107,108,111,113,115,],[19,-3,-5,19,-21,-22,-23,-24,-25,36,37,38,43,-4,51,51,51,43,-58,-28,-29,-30,-31,-32,-33,-34,-35,43,-6,-13,-14,-7,73,-9,-10,-11,-12,19,-26,-27,76,-43,79,-37,87,89,-36,43,-8,73,-49,-42,-44,-46,43,79,43,89,19,-47,-45,43,-50,19,-41,]),'LBRACKET':([2,3,4,13,14,15,16,17,18,23,24,27,35,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,58,59,60,61,62,63,67,83,84,85,87,90,91,92,93,99,104,106,107,108,111,113,115,],[20,-3,-5,20,-21,-22,-23,-24,-25,48,-4,53,62,-58,-28,-29,-30,-31,-32,-33,-34,-35,48,-6,-13,-14,-7,-9,-10,-11,-12,20,-26,-27,48,-43,-37,-36,48,-8,-49,-42,-44,-46,48,48,20,-47,-45,48,-50,20,-41,]),'FOR':([2,3,4,13,14,15,16,17,18,24,39,40,41,42,43,44,45,46,47,49,50,51,52,54,55,56,58,59,60,61,63,67,83,85,87,90,91,92,104,106,107,111,113,115,],[21,-3,-5,21,-21,-22,-23,-24,-25,-4,-58,-28,-29,-30,-31,-32,-33,-34,-35,-6,-13,-14,-7,-9,-10,-11,-12,21,-26,-27,-43,-37,-36,-8,-49,-42,-44,-46,21,-47,-45,-50,21,-41,]),'KEYWORD_KEYWORD':([2,3,4,13,14,15,16,17,18,24,39,40,41,42,43,44,45,46,47,49,50,51,52,54,55,56,58,59,60,61,63,67,83,85,87,90,91,92,104,106,107,111,113,115,],[22,-3,-5,22,-21,-22,-23,-24,-25,-4,-58,-28,-29,-30,-31,-32,-33,-34,-35,-6,-13,-14,-7,-9,-10,-11,-12,22,-26,-27,-43,-37,-36,-8,-49,-42,-44,-46,22,-47,-45,-50,22,-41,]),'RETURN':([2,3,4,13,14,15,16,17,18,24,39,40,41,42,43,44,45,46,47,49,50,51,52,54,55,56,58,59,60,61,63,67,83,85,87,90,91,92,104,106,107,111,113,115,],[23,-3,-5,23,-21,-22,-23,-24,-25,-4,-58,-28,-29,-30,-31,-32,-33,-34,-35,-6,-13,-14,-7,-9,-10,-11,-12,23,-26,-27,-43,-37,-36,-8,-49,-42,-44,-46,23,-47,-45,-50,23,-41,]),'COLON':([5,6,7,8,9,10,11,89,],[25,26,27,28,29,30,31,99,]),'TEARDOWN_KEYWORD':([12,13,14,15,16,17,18,34,39,40,41,42,43,44,45,46,47,60,61,63,67,83,90,91,92,106,107,111,115,],[33,-20,-21,-22,-23,-24,-25,-19,-58,-28,-29,-30,-31,-32,-33,-34,-35,-26,-27,-43,-37,-36,-42,-44,-46,-47,-45,-50,-41,]),'END':([13,14,15,16,17,18,34,39,40,41,42,43,44,45,46,47,60,61,63,67,75,83,90,91,92,106,107,109,111,114,115,],[-20,-21,-22,-23,-24,-25,-19,-58,-28,-29,-30,-31,-32,-33,-34,-35,-26,-27,-43,-37,88,-36,-42,-44,-46,-47,-45,111,-50,115,-41,]),'EQUALS':([19,79,],[35,94,]),'NUMBER':([23,35,48,62,84,93,94,99,108,],[40,40,40,40,40,40,103,40,40,]),'STRING':([23,25,26,28,30,31,35,48,53,62,84,86,93,94,99,108,],[41,50,50,50,57,58,41,41,72,41,41,72,41,102,41,41,]),'PLACEHOLDER':([23,35,48,62,84,93,99,108,],[42,42,42,42,42,42,42,42,]),'TRUE':([23,35,48,62,84,93,99,108,],[46,46,46,46,46,46,46,46,]),'FALSE':([23,35,48,62,84,93,99,108,],[47,47,47,47,47,47,47,47,]),'DATE':([29,],[55,]),'DO':([33,95,112,],[59,104,113,]),'RBRACKET':([36,40,41,42,43,44,45,46,47,48,62,66,67,68,69,70,71,72,73,76,83,97,98,],[63,-28,-29,-30,-31,-32,-33,-34,-35,67,67,83,-37,-38,-40,85,-16,-17,-18,63,-36,-39,-15,]),'IN':([37,],[64,]),'LPAREN':([38,78,],[65,93,]),'COMMA':([40,41,42,43,44,45,46,47,63,67,68,69,71,72,73,76,79,82,83,92,101,102,103,106,],[-28,-29,-30,-31,-32,-33,-34,-35,77,-37,84,-40,86,-17,-18,-31,-57,96,-36,100,108,-55,-56,-47,]),'RPAREN':([40,41,42,43,44,45,46,47,65,67,79,80,81,82,83,102,103,105,110,],[-28,-29,-30,-31,-32,-33,-34,-35,-52,-37,-57,95,-51,-54,-36,-55,-56,-53,112,]),'USING':([57,],[74,]),'RANGE':([64,],[78,]),}
 
 _lr_action = {}
 for _k, _v in _lr_action_items.items():
@@ -17,7 +17,7 @@ for _k, _v in _lr_action_items.items():
       _lr_action[_x][_k] = _y
 del _lr_action_items
 
-_lr_goto_items = {'start':([0,],[1,]),'metadata':([0,],[2,]),'metadata_items':([0,4,],[3,19,]),'metadata_item':([0,4,],[4,4,]),'statements':([2,12,41,90,],[11,28,60,91,]),'statement':([2,12,41,90,],[12,12,12,12,]),'assignment':([2,12,41,90,],[13,13,13,13,]),'keyword_call':([2,12,29,41,90,],[14,14,44,14,14,]),'loop':([2,12,41,90,],[15,15,15,15,]),'teardown':([11,],[26,]),'metadata_value':([20,21,23,],[32,35,37,]),'data_source':([25,],[39,]),'expression':([29,50,61,74,79,82,87,],[43,66,66,66,84,85,88,]),'boolean_expr':([29,50,61,74,79,82,87,],[48,48,48,48,48,48,48,]),'list_expr':([29,50,61,74,79,82,87,],[49,49,49,49,49,49,49,]),'tags':([36,70,],[55,80,]),'tag':([36,70,],[56,56,]),'list_items':([50,61,74,],[64,64,81,]),'list_item':([50,61,74,],[65,65,65,]),'parameter_list':([67,],[76,]),'parameter_items':([67,83,],[77,86,]),'parameter_item':([67,83,],[78,78,]),}
+_lr_goto_items = {'start':([0,],[1,]),'metadata':([0,],[2,]),'metadata_items':([0,4,],[3,24,]),'metadata_item':([0,4,],[4,4,]),'statements':([2,13,59,104,113,],[12,34,75,109,114,]),'statement':([2,13,59,104,113,],[13,13,13,13,13,]),'assignment':([2,13,59,104,113,],[14,14,14,14,14,]),'keyword_call':([2,13,35,59,104,113,],[15,15,61,15,15,15,]),'loop':([2,13,59,104,113,],[16,16,16,16,16,]),'custom_keyword':([2,13,59,104,113,],[17,17,17,17,17,]),'return_statement':([2,13,59,104,113,],[18,18,18,18,18,]),'teardown':([12,],[32,]),'expression':([23,35,48,62,84,93,99,108,],[39,60,69,69,69,101,106,110,]),'boolean_expr':([23,35,48,62,84,93,99,108,],[44,44,44,44,44,44,44,44,]),'list_expr':([23,35,48,62,84,93,99,108,],[45,45,45,45,45,45,45,45,]),'metadata_value':([25,26,28,],[49,52,54,]),'data_source':([30,],[56,]),'list_items':([48,62,84,],[66,66,97,]),'list_item':([48,62,84,],[68,68,68,]),'tags':([53,86,],[70,98,]),'tag':([53,86,],[71,71,]),'param_definitions':([65,],[80,]),'param_def_list':([65,96,],[81,105,]),'param_def':([65,96,],[82,82,]),'parameter_list':([77,],[90,]),'parameter_items':([77,100,],[91,107,]),'parameter_item':([77,100,],[92,92,]),}
 
 _lr_goto = {}
 for _k, _v in _lr_goto_items.items():
@@ -38,39 +38,51 @@ _lr_productions = [
   ('metadata_item -> AUTHOR_KEYWORD COLON metadata_value','metadata_item',3,'p_metadata_item','parser.py',47),
   ('metadata_item -> DATE_KEYWORD COLON DATE','metadata_item',3,'p_metadata_item','parser.py',48),
   ('metadata_item -> DATA_KEYWORD COLON data_source','metadata_item',3,'p_metadata_item','parser.py',49),
-  ('metadata_value -> STRING','metadata_value',1,'p_metadata_value','parser.py',61),
-  ('metadata_value -> ID','metadata_value',1,'p_metadata_value','parser.py',62),
-  ('tags -> tag COMMA tags','tags',3,'p_tags','parser.py',67),
-  ('tags -> tag','tags',1,'p_tags','parser.py',68),
-  ('tag -> STRING','tag',1,'p_tag','parser.py',76),
-  ('tag -> ID','tag',1,'p_tag','parser.py',77),
-  ('statements -> statement statements','statements',2,'p_statements','parser.py',82),
-  ('statements -> statement','statements',1,'p_statements','parser.py',83),
-  ('statement -> assignment','statement',1,'p_statement','parser.py',91),
-  ('statement -> keyword_call','statement',1,'p_statement','parser.py',92),
-  ('statement -> loop','statement',1,'p_statement','parser.py',93),
-  ('assignment -> ID EQUALS expression','assignment',3,'p_assignment','parser.py',98),
-  ('assignment -> ID EQUALS keyword_call','assignment',3,'p_assignment','parser.py',99),
-  ('expression -> NUMBER','expression',1,'p_expression','parser.py',107),
-  ('expression -> STRING','expression',1,'p_expression','parser.py',108),
-  ('expression -> PLACEHOLDER','expression',1,'p_expression','parser.py',109),
-  ('expression -> ID','expression',1,'p_expression','parser.py',110),
-  ('expression -> boolean_expr','expression',1,'p_expression','parser.py',111),
-  ('expression -> list_expr','expression',1,'p_expression','parser.py',112),
-  ('boolean_expr -> TRUE','boolean_expr',1,'p_boolean_expr','parser.py',117),
-  ('boolean_expr -> FALSE','boolean_expr',1,'p_boolean_expr','parser.py',118),
-  ('list_expr -> LBRACKET list_items RBRACKET','list_expr',3,'p_list_expr','parser.py',123),
-  ('list_expr -> LBRACKET RBRACKET','list_expr',2,'p_list_expr','parser.py',124),
-  ('list_items -> list_item','list_items',1,'p_list_items','parser.py',132),
-  ('list_items -> list_item COMMA list_items','list_items',3,'p_list_items','parser.py',133),
-  ('list_item -> expression','list_item',1,'p_list_item','parser.py',141),
-  ('loop -> FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements END','loop',12,'p_loop','parser.py',146),
-  ('keyword_call -> LBRACKET ID RBRACKET COMMA parameter_list','keyword_call',5,'p_keyword_call','parser.py',151),
-  ('keyword_call -> LBRACKET ID RBRACKET','keyword_call',3,'p_keyword_call','parser.py',152),
-  ('parameter_list -> parameter_items','parameter_list',1,'p_parameter_list','parser.py',160),
-  ('parameter_items -> parameter_item COMMA parameter_items','parameter_items',3,'p_parameter_items','parser.py',165),
-  ('parameter_items -> parameter_item','parameter_items',1,'p_parameter_items','parser.py',166),
-  ('parameter_item -> ID COLON expression','parameter_item',3,'p_parameter_item','parser.py',174),
-  ('teardown -> TEARDOWN_KEYWORD DO statements END','teardown',4,'p_teardown','parser.py',179),
-  ('data_source -> STRING USING ID','data_source',3,'p_data_source','parser.py',184),
+  ('metadata_item -> IMPORT_KEYWORD COLON STRING','metadata_item',3,'p_metadata_item','parser.py',50),
+  ('metadata_value -> STRING','metadata_value',1,'p_metadata_value','parser.py',64),
+  ('metadata_value -> ID','metadata_value',1,'p_metadata_value','parser.py',65),
+  ('tags -> tag COMMA tags','tags',3,'p_tags','parser.py',70),
+  ('tags -> tag','tags',1,'p_tags','parser.py',71),
+  ('tag -> STRING','tag',1,'p_tag','parser.py',79),
+  ('tag -> ID','tag',1,'p_tag','parser.py',80),
+  ('statements -> statement statements','statements',2,'p_statements','parser.py',85),
+  ('statements -> statement','statements',1,'p_statements','parser.py',86),
+  ('statement -> assignment','statement',1,'p_statement','parser.py',94),
+  ('statement -> keyword_call','statement',1,'p_statement','parser.py',95),
+  ('statement -> loop','statement',1,'p_statement','parser.py',96),
+  ('statement -> custom_keyword','statement',1,'p_statement','parser.py',97),
+  ('statement -> return_statement','statement',1,'p_statement','parser.py',98),
+  ('assignment -> ID EQUALS expression','assignment',3,'p_assignment','parser.py',103),
+  ('assignment -> ID EQUALS keyword_call','assignment',3,'p_assignment','parser.py',104),
+  ('expression -> NUMBER','expression',1,'p_expression','parser.py',112),
+  ('expression -> STRING','expression',1,'p_expression','parser.py',113),
+  ('expression -> PLACEHOLDER','expression',1,'p_expression','parser.py',114),
+  ('expression -> ID','expression',1,'p_expression','parser.py',115),
+  ('expression -> boolean_expr','expression',1,'p_expression','parser.py',116),
+  ('expression -> list_expr','expression',1,'p_expression','parser.py',117),
+  ('boolean_expr -> TRUE','boolean_expr',1,'p_boolean_expr','parser.py',122),
+  ('boolean_expr -> FALSE','boolean_expr',1,'p_boolean_expr','parser.py',123),
+  ('list_expr -> LBRACKET list_items RBRACKET','list_expr',3,'p_list_expr','parser.py',128),
+  ('list_expr -> LBRACKET RBRACKET','list_expr',2,'p_list_expr','parser.py',129),
+  ('list_items -> list_item','list_items',1,'p_list_items','parser.py',137),
+  ('list_items -> list_item COMMA list_items','list_items',3,'p_list_items','parser.py',138),
+  ('list_item -> expression','list_item',1,'p_list_item','parser.py',146),
+  ('loop -> FOR ID IN RANGE LPAREN expression COMMA expression RPAREN DO statements END','loop',12,'p_loop','parser.py',151),
+  ('keyword_call -> LBRACKET ID RBRACKET COMMA parameter_list','keyword_call',5,'p_keyword_call','parser.py',156),
+  ('keyword_call -> LBRACKET ID RBRACKET','keyword_call',3,'p_keyword_call','parser.py',157),
+  ('parameter_list -> parameter_items','parameter_list',1,'p_parameter_list','parser.py',165),
+  ('parameter_items -> parameter_item COMMA parameter_items','parameter_items',3,'p_parameter_items','parser.py',170),
+  ('parameter_items -> parameter_item','parameter_items',1,'p_parameter_items','parser.py',171),
+  ('parameter_item -> ID COLON expression','parameter_item',3,'p_parameter_item','parser.py',179),
+  ('teardown -> TEARDOWN_KEYWORD DO statements END','teardown',4,'p_teardown','parser.py',184),
+  ('data_source -> STRING USING ID','data_source',3,'p_data_source','parser.py',189),
+  ('custom_keyword -> KEYWORD_KEYWORD ID LPAREN param_definitions RPAREN DO statements END','custom_keyword',8,'p_custom_keyword','parser.py',194),
+  ('param_definitions -> param_def_list','param_definitions',1,'p_param_definitions','parser.py',199),
+  ('param_definitions -> <empty>','param_definitions',0,'p_param_definitions','parser.py',200),
+  ('param_def_list -> param_def COMMA param_def_list','param_def_list',3,'p_param_def_list','parser.py',208),
+  ('param_def_list -> param_def','param_def_list',1,'p_param_def_list','parser.py',209),
+  ('param_def -> ID EQUALS STRING','param_def',3,'p_param_def','parser.py',217),
+  ('param_def -> ID EQUALS NUMBER','param_def',3,'p_param_def','parser.py',218),
+  ('param_def -> ID','param_def',1,'p_param_def','parser.py',219),
+  ('return_statement -> RETURN expression','return_statement',2,'p_return_statement','parser.py',227),
 ]

pytest_dsl/core/variable_utils.py

@@ -110,7 +110,7 @@ class VariableReplacer:
             return value
             
         # 处理变量引用模式: ${variable} 或 ${variable.field.subfield}
-        pattern = r'\$\{([a-zA-Z_][a-zA-Z0-9_]*(?:\.[a-zA-Z_][a-zA-Z0-9_]*)*)\}'
+        pattern = r'\$\{([a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*(?:\.[a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*)*)\}'
         
         result = value
         matches = list(re.finditer(pattern, result))

pytest_dsl/examples/custom/test_advanced_keywords.auto

@@ -0,0 +1,31 @@
+@name: 高级自定义关键字测试
+@description: 测试带嵌套导入的自定义关键字功能
+@tags: [测试, 自定义关键字, 嵌套导入]
+@author: Felix
+@date: 2024-06-11
+
+# 导入高级工具资源文件（该文件已导入基础工具资源文件）
+@import: "pytest_dsl/examples/custom/resources/advanced_utils.resource"
+
+[打印],内容:'开始测试高级自定义关键字'
+
+# 测试基础工具中的格式化消息关键字
+消息模板值 = "当前状态"
+变量值 = "正在运行"
+格式化结果 = [格式化消息],消息模板:${消息模板值},变量:${变量值}
+[打印],内容:'基础工具格式化结果: ${格式化结果}'
+
+[断言],条件:'${格式化结果} == "当前状态: 正在运行"',消息:'格式化消息结果不匹配'
+
+# 测试高级工具中的生成报告消息关键字
+标题值 = "测试报告"
+内容值 = "测试全部通过"
+报告结果 = [生成报告消息],标题:${标题值},内容:${内容值}
+[打印],内容:'生成的报告:\n${报告结果}'
+
+# 不进行复杂断言，只确认返回结果不为空
+[断言],条件:'${报告结果} != ""',消息:'报告结果不应为空'
+
+@teardown do
+    [打印],内容:'高级自定义关键字测试完成'
+end 

pytest_dsl/examples/custom/test_custom_keywords.auto

@@ -0,0 +1,37 @@
+@name: 自定义关键字测试
+@description: 测试自定义关键字功能
+@tags: [测试, 自定义关键字]
+@author: Felix
+@date: 2024-06-11
+
+# 导入资源文件
+@import: "pytest_dsl/examples/custom/resources/common_utils.resource"
+
+[打印],内容:'开始测试自定义关键字'
+
+# 定义测试输入参数
+前缀值 = "你好, "
+后缀值 = "世界"
+
+# 测试拼接字符串关键字
+[打印],内容:'测试拼接字符串关键字'
+拼接结果 = [拼接字符串],前缀:${前缀值},后缀:${后缀值}
+[打印],内容:'获取到拼接结果: ${拼接结果}'
+
+拼接结果2 = [拼接字符串],前缀:haha
+[打印],内容:'获取到拼接结果2: ${拼接结果2}'
+
+# 测试断言
+[断言],条件:'${拼接结果} == "你好, 世界"',消息:'字符串拼接不匹配'
+
+# 测试计算长度关键字
+[打印],内容:'测试计算长度关键字'
+测试文本 = "这是测试文本"
+文本长度 = [计算长度],文本:${测试文本}
+[打印],内容:'获取到文本长度: ${文本长度}'
+
+[断言],条件:'${文本长度} == 10',消息:'长度不匹配'
+
+@teardown do
+    [打印],内容:'自定义关键字测试完成'
+end 

pytest_dsl/examples/custom/test_default_values.auto

@@ -0,0 +1,34 @@
+@name: 默认值测试
+@description: 测试自定义关键字默认值功能
+@tags: [测试, 自定义关键字, 默认值]
+@author: Felix
+@date: 2024-06-11
+
+# 导入资源文件
+@import: "pytest_dsl/examples/custom/resources/common_utils.resource"
+@import: "pytest_dsl/examples/custom/resources/base_utils.resource"
+@import: "pytest_dsl/examples/custom/resources/advanced_utils.resource"
+
+[打印],内容:'开始测试自定义关键字默认值'
+
+# 测试带默认值的参数 - 不传递该参数
+[打印],内容:'测试不提供带默认值的参数:'
+拼接结果1 = [拼接字符串],前缀:"Hello "
+[打印],内容:'使用默认后缀的拼接结果: ${拼接结果1}'
+
+# 测试带默认值的参数 - 传递该参数
+[打印],内容:'测试提供带默认值的参数:'
+拼接结果2 = [拼接字符串],前缀:"Hello ",后缀:"Override"
+[打印],内容:'使用自定义后缀的拼接结果: ${拼接结果2}'
+
+# 测试base_utils.resource中的带默认值关键字
+格式化结果1 = [格式化消息],消息模板:"测试消息"
+[打印],内容:'使用默认变量的格式化结果: ${格式化结果1}'
+
+# 测试advanced_utils.resource中的带默认值关键字
+报告结果1 = [生成报告消息],标题:"仅标题测试"
+[打印],内容:'使用默认内容的报告:\n${报告结果1}'
+
+@teardown do
+    [打印],内容:'默认值测试完成'
+end 

pytest_dsl/examples/http/http_retry_assertions.auto

@@ -16,7 +16,7 @@
         asserts:
             - ["status", "eq", 200]
             - ["jsonpath", "$.url", "contains", "httpbin.org"]
-            - ["response_time", "lt", 1000]  # 这个断言可能会失败，因为请求延迟约2秒
+            - ["response_time", "lt", 3000]  # 这个断言可能会失败，因为请求延迟约2秒
     ''',步骤名称: "旧版全局断言重试示例"
 
 # 示例2: 使用indices指定重试特定断言
@@ -56,7 +56,7 @@
         url: https://httpbin.org/delay/1
         asserts:
             - ["status", "eq", 200]                # 索引0
-            - ["response_time", "lt", 800]         # 索引1
+            - ["response_time", "lt", 2000]         # 索引1
             - ["jsonpath", "$.headers.Host", "eq", "httpbin.org"]  # 索引2
             - ["jsonpath", "$.url", "contains", "httpbin.org"]     # 索引3
         retry_assertions:

pytest_dsl/examples/http/http_retry_assertions_enhanced.auto

@@ -13,7 +13,7 @@
         asserts:
             - ["status", "eq", 200]
             - ["jsonpath", "$.url", "contains", "httpbin.org"]
-            - ["response_time", "lt", 1000]  # 这个断言可能会失败，因为请求延迟约2秒
+            - ["response_time", "lt", 3003]  # 这个断言可能会失败，因为请求延迟约2秒
         retry_assertions:
             count: 3
             interval: 1
@@ -57,7 +57,7 @@
         url: https://httpbin.org/delay/1
         asserts:
             - ["status", "eq", 200]                # 索引0
-            - ["response_time", "lt", 800]         # 索引1
+            - ["response_time", "lt", 2500]         # 索引1
             - ["jsonpath", "$.headers.Host", "eq", "httpbin.org"]  # 索引2
         retry_assertions:
             # 全局设置

pytest_dsl/examples/test_custom_keyword.py

@@ -0,0 +1,9 @@
+from pytest_dsl.core.auto_decorator import auto_dsl
+
+@auto_dsl("./custom")
+class TestCustomKeyword:
+    """自定义关键字测试
+    
+    此测试类将自动加载当前目录下的所有.auto文件
+    """
+    pass 

pytest_dsl/examples/test_http.py

@@ -27,142 +27,3 @@ class TestHttp:
     """
     pass
 
-# 定义自定义认证提供者
-class HMACAuthProvider(CustomAuthProvider):
-    def apply_auth(self, request_kwargs):
-        if "headers" not in request_kwargs:
-            request_kwargs["headers"] = {}
-        request_kwargs["headers"]["Authorization"] = "HMAC-SHA256 test_signature"
-        request_kwargs["headers"]["X-Amz-Date"] = "20240501T120000Z"
-        return request_kwargs
-
-class JWTAuthProvider(CustomAuthProvider):
-    def apply_auth(self, request_kwargs):
-        if "headers" not in request_kwargs:
-            request_kwargs["headers"] = {}
-        request_kwargs["headers"]["Authorization"] = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.example_token"
-        return request_kwargs
-
-class WeChatAuthProvider(CustomAuthProvider):
-    def apply_auth(self, request_kwargs):
-        if "headers" not in request_kwargs:
-            request_kwargs["headers"] = {}
-        request_kwargs["headers"]["X-Wx-Openid"] = "test_openid"
-        request_kwargs["headers"]["X-Wx-Session-Key"] = "test_session_key"
-        return request_kwargs
-
-class MultiStepAuthProvider(CustomAuthProvider):
-    def apply_auth(self, request_kwargs):
-        if "headers" not in request_kwargs:
-            request_kwargs["headers"] = {}
-        request_kwargs["headers"]["Authorization"] = "Bearer multi_step_token"
-        return request_kwargs
-
-class CSRFLoginAuthProvider(CustomAuthProvider):
-    """CSRF登录认证提供者
-    
-    该提供者实现了一个需要先登录获取CSRF令牌，然后在后续请求中使用该令牌的认证流程。
-    为了适应httpbin.org的测试，这里模拟了CSRF认证流程。
-    """
-    def __init__(self):
-        self._csrf_token = None
-        self._session = requests.Session()
-        logger.setLevel(logging.DEBUG)  # 设置日志级别为DEBUG
-        
-    def apply_auth(self, request_kwargs):
-        # 确保headers存在
-        if "headers" not in request_kwargs:
-            request_kwargs["headers"] = {}
-            
-        # 如果还没有CSRF令牌，先登录获取
-        if not self._csrf_token:
-            self._login()
-            
-        # 添加CSRF令牌到请求头
-        request_kwargs["headers"]["X-Csrf-Token"] = self._csrf_token
-        
-        # 设置Content-Type头
-        # 如果请求中有JSON数据
-        if "json" in request_kwargs:
-            request_kwargs["headers"]["Content-Type"] = "application/json"
-            logger.debug(f"请求体 (JSON): {json.dumps(request_kwargs['json'])}")
-        # 如果请求中有表单数据
-        elif "data" in request_kwargs:
-            # 如果data是字典，默认为表单数据
-            if isinstance(request_kwargs["data"], dict):
-                if "Content-Type" not in request_kwargs["headers"]:
-                    request_kwargs["headers"]["Content-Type"] = "application/x-www-form-urlencoded"
-            logger.debug(f"请求体 (form): {request_kwargs['data']}")
-        
-        # 调试信息：打印请求信息
-        method = request_kwargs.get('method', 'GET')
-        url = request_kwargs.get('url', '')
-        logger.debug(f"发送请求: {method} {url}")
-        logger.debug(f"请求头: {json.dumps(request_kwargs.get('headers', {}))}")
-        
-        return request_kwargs
-    
-    def clean_auth_state(self, request_kwargs=None):
-        """清理CSRF认证状态
-        
-        清理CSRF认证相关的状态，包括令牌和会话。
-        
-        Args:
-            request_kwargs: 请求参数
-            
-        Returns:
-            更新后的请求参数
-        """
-        # 重置CSRF令牌
-        logger.debug("清理CSRF认证状态")
-        self._csrf_token = None
-        
-        # 如果有会话，清理会话
-        if self._session:
-            self._session.cookies.clear()
-            logger.debug("已清理CSRF会话cookie")
-            
-        # 处理请求参数
-        if request_kwargs:
-            if "headers" not in request_kwargs:
-                request_kwargs["headers"] = {}
-                
-            # 移除CSRF相关头
-            csrf_headers = ['X-Csrf-Token', 'X-CSRF-Token', 'csrf-token', 'CSRF-Token']
-            for header in csrf_headers:
-                if header in request_kwargs["headers"]:
-                    request_kwargs["headers"].pop(header)
-                    logger.debug(f"已移除请求头: {header}")
-                    
-        # 标记会话已管理
-        self.manage_session = True
-                    
-        return request_kwargs if request_kwargs else {}
-        
-    def _login(self):
-        """执行登录流程获取CSRF令牌
-        
-        由于httpbin.org没有实际的登录系统，这里模拟一个登录流程
-        """
-        # 对于测试目的，生成一个模拟的CSRF令牌
-        self._csrf_token = "csrf_token_12345678"
-        logger.debug(f"生成CSRF令牌: {self._csrf_token}")
-
-        # 如果使用真实API，可以使用类似下面的代码
-        # 1. 获取登录页面，提取CSRF令牌
-        # login_page = self._session.get("https://httpbin.org/headers")
-        # login_page.raise_for_status()
-        
-        # 2. 执行登录请求
-        # login_response = self._session.post(
-        #     "https://httpbin.org/anything",
-        #     json={"username": "test_user", "password": "test_password"}
-        # )
-        # login_response.raise_for_status()
-
-# 注册自定义认证提供者
-register_auth_provider("hmac_aws_auth", HMACAuthProvider)
-register_auth_provider("jwt_refresh_auth", JWTAuthProvider)
-register_auth_provider("wechat_miniapp_auth", WeChatAuthProvider)
-register_auth_provider("multi_step_auth", MultiStepAuthProvider)
-register_auth_provider("csrf_login_auth", CSRFLoginAuthProvider)