Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/component_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#
# --------------------------------------------------------------------------------------------------------------
#
VERSION = "0.6.0"
VERSION_DATE = "17.08.2023"
VERSION = "0.7.0"
VERSION_DATE = "07.09.2023"
#
# --------------------------------------------------------------------------------------------------------------
#TM***
Expand Down
88 changes: 44 additions & 44 deletions test/testconfig/TestConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#
# --------------------------------------------------------------------------------------------------------------
#
# 17.08.2023
# 07.09.2023
#
# !!! Temporarily tests are deactivated by the following line commented out:
# # # listofdictUsecases.append(dictUsecase)
Expand Down Expand Up @@ -661,9 +661,9 @@
[DICT] (22/19) > {innermost_milestone_name} [STR] : 'est'
[DICT] (22/20) > {ilesto} [STR] : 'ilesto'
[DICT] (22/21) > {milestone} [STR] : 'milestone'
[DICT] (22/22) > {VAR-VARIANT-1_MS-milestone_2_param} [STR] : 'value'
[DICT] (22/22) > {VAR-VARIANT-1_MS-MILESTONE-2_param} [STR] : 'value'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -704,9 +704,9 @@
[DICT] (22/19) > {innermost_milestone_name} [STR] : 'est'
[DICT] (22/20) > {ilesto} [STR] : 'ilesto'
[DICT] (22/21) > {milestone} [STR] : 'milestone'
[DICT] (22/22) > {VAR-VARIANT-1_MS-milestone_2_param} [STR] : 'value'
[DICT] (22/22) > {VAR-VARIANT-1_MS-MILESTONE-2_param} [STR] : 'value'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -749,7 +749,7 @@
[DICT] (22/21) > {milestone} [STR] : 'milestone'
[DICT] (22/22) > {param} [STR] : 'VAR-VARIANT-1_MS-MILESTONE-2 value'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -1007,7 +1007,7 @@
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0252.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "The variable '${IAMNOTEXISTING}' is not available!"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -1035,7 +1035,7 @@
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0254.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "The variable '${IAMNOTEXISTING}' is not available!"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -1253,21 +1253,21 @@
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0301.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = None
dictUsecase['EXPECTEDRETURN'] = """
[DICT] (13/1) > {par1} [FLOAT] : 1.23
[DICT] (13/1) > {par2} [LIST] (2/1) > [STR] : 'A'
[DICT] (13/1) > {par2} [LIST] (2/2) > [STR] : 'B'
[DICT] (13/2) > {par3} [LIST] (1/1) > [STR] : 'par'
[DICT] (13/3) > {ara} [STR] : 'ara'
[DICT] (13/4) > {param} [STR] : 'param'
[DICT] (13/5) > {param2} [LIST] (1/1) > [STR] : 'par'
[DICT] (13/6) > {val1} [STR] : '{par1}am}'
[DICT] (13/6) > {val2} [STR] : 'param}'
[DICT] (13/6) > {val3} [STR] : 'param}'
[DICT] (13/6) > {val4} [STR] : 'param}'
[DICT] (13/6) > {val5} [STR] : 'param2}[0]'
[DICT] (13/6) > {val6} [STR] : 'param2.0}'
[DICT] (12/1) > {par1} [FLOAT] : 1.23
[DICT] (12/2) > {par2} [LIST] (2/1) > [STR] : 'A'
[DICT] (12/2) > {par2} [LIST] (2/2) > [STR] : 'B'
[DICT] (12/3) > {par3} [LIST] (1/1) > [STR] : 'par'
[DICT] (12/4) > {ara} [STR] : 'ara'
[DICT] (12/5) > {param} [STR] : 'param'
[DICT] (12/6) > {param2} [LIST] (1/1) > [STR] : 'par'
[DICT] (12/7) > {val1} [STR] : '{par1}am}'
[DICT] (12/8) > {val2} [STR] : '1.23am}'
[DICT] (12/9) > {val3} [STR] : 'param}'
[DICT] (12/10) > {val4} [STR] : 'param}'
[DICT] (12/11) > {val5} [STR] : 'param2}[0]'
[DICT] (12/12) > {val6} [STR] : 'param2.0}'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1290,7 +1290,7 @@
[DICT] (8/7) > {val5} [INT] : 123
[DICT] (8/8) > {val6} [STR] : '123'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1305,7 +1305,7 @@
dictUsecase['EXPECTEDEXCEPTION'] = None
dictUsecase['EXPECTEDRETURN'] = """
[DICT] (10/1) > {ara} [STR] : 'ara'
[DICT] (10/2) > {lara} [STR] : 'ara'
[DICT] (10/2) > {lara} [LIST] (1/1) > [STR] : 'ara'
[DICT] (10/3) > {param} [INT] : 123
[DICT] (10/4) > {param} [LIST] (1/1) > [FLOAT] : 4.56
[DICT] (10/5) > {val1} [INT] : 123
Expand Down Expand Up @@ -1333,15 +1333,15 @@
[DICT] (10/2) > {param2} [STR] : 'param2'
[DICT] (10/3) > {param3} [LIST] (2/1) > [INT] : 123
[DICT] (10/3) > {param3} [LIST] (2/2) > [FLOAT] : 4.56
[DICT] (10/4) > {lara} [LIST] (1/1) > [STR] : "ara"
[DICT] (10/4) > {lara} [LIST] (1/1) > [STR] : 'ara'
[DICT] (10/5) > {ara} [STR] : 'ara'
[DICT] (10/6) > {val1} [STR] : 'param1param2'
[DICT] (10/7) > {val2} [STR] : '1234.56'
[DICT] (10/8) > {val3} [STR] : '1234.56'
[DICT] (10/9) > {val4} [STR] : 'ABC, param1, param2, XYZ'
[DICT] (10/10) > {val5} [STR] : 'param1, ABC ; XYZ / param2'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
# --------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1452,9 +1452,9 @@
dictUsecase['HINT'] = "Checklist rule 2 / pattern 5"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0357.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "invalid syntax (placeholder)"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1480,9 +1480,9 @@
dictUsecase['HINT'] = "Checklist rule 2 / pattern 7"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0359.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "invalid syntax (placeholder)"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -1592,9 +1592,9 @@
dictUsecase['HINT'] = "Checklist rule 6 / pattern 1"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0367.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "Key name or value is a mix of nested parameters and hard coded parts"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1606,9 +1606,9 @@
dictUsecase['HINT'] = "Checklist rule 6 / pattern 2"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0368.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "Key name or value is a mix of nested parameters and hard coded parts"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1620,9 +1620,9 @@
dictUsecase['HINT'] = "Checklist rule 6 / pattern 3"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0369.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "Key name or value is a mix of nested parameters and hard coded parts"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1634,9 +1634,9 @@
dictUsecase['HINT'] = "Checklist rule 6 / pattern 4"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0370.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "Key name or value is a mix of nested parameters and hard coded parts"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand All @@ -1648,9 +1648,9 @@
dictUsecase['HINT'] = "Checklist rule 6 / pattern 5"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0371.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "Key name or value is a mix of nested parameters and hard coded parts"
dictUsecase['EXPECTEDEXCEPTION'] = "The double quotes are missing"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
# --------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1718,7 +1718,7 @@
[DICT] (2/1) > {params} [LIST] (2/2) > [DICT] (2/2) > {dict_2_key_2} [DICT] (2/2) > {dict_2_A_key_2} [LIST] (3/3) > [DICT] (2/2) > {dict_2_A_key_2_subkey_2} [LIST] (2/2) > [STR] : 'value_2'
[DICT] (2/2) > {param} [STR] : 'value_2'
"""
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
dictUsecase = {}
Expand Down Expand Up @@ -1868,11 +1868,11 @@
dictUsecase['SECTION'] = "COMPOSITE_EXPRESSIONS"
dictUsecase['SUBSECTION'] = "BADCASE"
dictUsecase['HINT'] = "Dotdict notation (ambiguous in this case)"
dictUsecase['COMMENT'] = "Needs clarification!"
dictUsecase['COMMENT'] = None
dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0550.jsonp"
dictUsecase['EXPECTEDEXCEPTION'] = "detected ambiguous expression (= variable not found) (placeholder)"
dictUsecase['EXPECTEDEXCEPTION'] = "is not available"
dictUsecase['EXPECTEDRETURN'] = None
# # # listofdictUsecases.append(dictUsecase)
listofdictUsecases.append(dictUsecase)
del dictUsecase
# --------------------------------------------------------------------------------------------------------------
# --------------------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion test/testfiles/jpp-test_config_0304.jsonp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"param1" : "param1",
"param2" : "param2",
"param3" : [123, 456],
"param3" : [123, 4.56],
"lara" : ["ara"],
"ara" : "ara",
//
Expand Down