From 7e59ede28056c138054a3534adfffa66b3d4e89e Mon Sep 17 00:00:00 2001 From: qth2hi Date: Tue, 10 Oct 2023 13:34:22 +0200 Subject: [PATCH] Activated test cases JPP_0358, JPP_0356, JPP_0355, JPP_0005, JPP_0207 Caution: JPP_0207 freezes the application as long as https://github.com/test-fullautomation/python-jsonpreprocessor/issues/164 is not solved. --- test/JPP_TestUsecases.csv | 5 + test/JPP_TestUsecases.html | 276 ++++++++++++++---- test/JPP_TestUsecases.rst | 58 +++- test/JPP_TestUsecases.txt | 25 +- test/component_test.py | 4 +- .../test_01_DATA_TYPES_GOODCASE.py | 10 +- .../test_02_DATA_INTEGRITY_GOODCASE.py | 2 +- ...test_03_PARAMETER_SUBSTITUTION_GOODCASE.py | 10 +- .../test_04_PARAMETER_SUBSTITUTION_BADCASE.py | 2 +- .../test_05_VALUE_DETECTION_GOODCASE.py | 2 +- .../test_06_VALUE_DETECTION_BADCASE.py | 26 +- .../test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py | 2 +- .../test_08_COMPOSITE_EXPRESSIONS_BADCASE.py | 2 +- ...st_09_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py | 2 +- ...est_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py | 2 +- .../test_11_IMPLICIT_CREATION_GOODCASE.py | 2 +- .../test_12_CYCLIC_IMPORTS_BADCASE.py | 2 +- .../test_13_PATH_FORMATS_GOODCASE.py | 2 +- test/testconfig/TestConfig.py | 80 ++++- 19 files changed, 433 insertions(+), 81 deletions(-) diff --git a/test/JPP_TestUsecases.csv b/test/JPP_TestUsecases.csv index 22f38f16..0848c255 100644 --- a/test/JPP_TestUsecases.csv +++ b/test/JPP_TestUsecases.csv @@ -3,6 +3,7 @@ TESTID|SECTION|SUBSECTION|DESCRIPTION JPP_0001|DATA_TYPES|GOODCASE|JSON file with parameters of different data types (basic and composite) JPP_0002|DATA_TYPES|GOODCASE|JSON file containing parameters with dollar operator syntax at right hand side of colon, basic data types JPP_0003|DATA_TYPES|GOODCASE|JSON file containing parameters with dollar operator syntax at right hand side of colon, composite data type: list +JPP_0005|DATA_TYPES|GOODCASE|JSON file with string values containing dollar operators JPP_0100|DATA_INTEGRITY|GOODCASE|JSON file is empty (single pair of brackets only) JPP_0101|DATA_INTEGRITY|GOODCASE|JSON file with string containing several separator characters and blanks; no parameters JPP_0102|DATA_INTEGRITY|GOODCASE|JSON file with string containing more special characters, masked special characters and escape sequences @@ -12,6 +13,7 @@ JPP_0202|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index JPP_0203|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation JPP_0204|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation JPP_0205|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation +JPP_0207|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation JPP_0250|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing JPP_0251|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing JPP_0252|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing @@ -29,7 +31,10 @@ JPP_0351|VALUE_DETECTION|BADCASE|JSON file with parameter of type 'list' / index JPP_0352|VALUE_DETECTION|BADCASE|JSON file with parameter of type 'list' / index (in square brackets) defined inside the curly brackets (invalid syntax 3) JPP_0353|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 1) JPP_0354|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 2) +JPP_0355|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 3) +JPP_0356|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 4) JPP_0357|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 5) +JPP_0358|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6) JPP_0359|VALUE_DETECTION|BADCASE|JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6) JPP_0361|VALUE_DETECTION|BADCASE|JSON file with expression containing more closing elements '}' than opening elements '${' (invalid syntax 1) JPP_0367|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' and ending with '}', further matching '${' and '}' in between (not all nested) (invalid syntax 1) diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html index 59113018..b49b032d 100644 --- a/test/JPP_TestUsecases.html +++ b/test/JPP_TestUsecases.html @@ -133,6 +133,39 @@ 4 + + + +JPP_0005 + + + + +DATA_TYPES + + + + +GOODCASE + + + + +JSON file with string values containing dollar operators
+Expected: All parameters referenced by dollar operator are resolved correctly, outcome is a string containing the values of all referenced parameters + + + + + + + + + + +5 + + @@ -163,7 +196,7 @@ -5 +6 @@ -196,7 +229,7 @@ -6 +7 @@ -229,7 +262,7 @@ -7 +8 @@ -262,7 +295,7 @@ -8 +9 @@ -295,7 +328,7 @@ -9 +10 @@ -328,7 +361,7 @@ -10 +11 @@ -361,7 +394,7 @@ -11 +12 @@ -394,7 +427,7 @@ -12 +13 @@ -427,7 +460,40 @@ -13 +14 + + + + + +JPP_0207 + + + + +PARAMETER_SUBSTITUTION + + + + +GOODCASE + + + + +JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation
+Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + + + + + + + + + + +15 @@ -460,7 +526,7 @@ -14 +16 @@ -493,7 +559,7 @@ -15 +17 @@ -526,7 +592,7 @@ -16 +18 @@ -559,7 +625,7 @@ -17 +19 @@ -592,7 +658,7 @@ -18 +20 @@ -625,7 +691,7 @@ -19 +21 @@ -658,7 +724,7 @@ -20 +22 @@ -691,7 +757,7 @@ -21 +23 @@ -725,7 +791,7 @@ -22 +24 @@ -759,7 +825,7 @@ -23 +25 @@ -793,7 +859,7 @@ -24 +26 @@ -827,7 +893,7 @@ -25 +27 @@ -861,7 +927,7 @@ -26 +28 @@ -895,7 +961,7 @@ -27 +29 @@ -929,7 +995,7 @@ -28 +30 @@ -963,7 +1029,7 @@ -29 +31 @@ -997,7 +1063,75 @@ -30 +32 + + + + + +JPP_0355 + + + + +VALUE_DETECTION + + + + +BADCASE + + + + +JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 3)
+Expected: No values are returned, and JsonPreprocessor throws an exception + +
+Checklist rule 2 / pattern 3 + + + + + + + + +33 + + + + + +JPP_0356 + + + + +VALUE_DETECTION + + + + +BADCASE + + + + +JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 4)
+Expected: No values are returned, and JsonPreprocessor throws an exception + +
+Checklist rule 2 / pattern 4 + + + + + + + + +34 @@ -1031,7 +1165,41 @@ -31 +35 + + + + + +JPP_0358 + + + + +VALUE_DETECTION + + + + +BADCASE + + + + +JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6)
+Expected: No values are returned, and JsonPreprocessor throws an exception + +
+Checklist rule 2 / pattern 6 + + + + + + + + +36 @@ -1065,7 +1233,7 @@ -32 +37 @@ -1099,7 +1267,7 @@ -33 +38 @@ -1133,7 +1301,7 @@ -34 +39 @@ -1167,7 +1335,7 @@ -35 +40 @@ -1201,7 +1369,7 @@ -36 +41 @@ -1235,7 +1403,7 @@ -37 +42 @@ -1269,7 +1437,7 @@ -38 +43 @@ -1303,7 +1471,7 @@ -39 +44 @@ -1337,7 +1505,7 @@ -40 +45 @@ -1371,7 +1539,7 @@ -41 +46 @@ -1404,7 +1572,7 @@ -42 +47 @@ -1437,7 +1605,7 @@ -43 +48 @@ -1470,7 +1638,7 @@ -44 +49 @@ -1503,7 +1671,7 @@ -45 +50 @@ -1536,7 +1704,7 @@ -46 +51 @@ -1570,7 +1738,7 @@ -47 +52 @@ -1603,7 +1771,7 @@ -48 +53 @@ -1636,7 +1804,7 @@ -49 +54 @@ -1669,7 +1837,7 @@ -50 +55 @@ -1702,7 +1870,7 @@ -51 +56 @@ -1735,7 +1903,7 @@ -52 +57 @@ -1768,7 +1936,7 @@ -53 +58 @@ -1801,7 +1969,7 @@ -54 +59 @@ -1834,7 +2002,7 @@ -55 +60 @@ -1867,7 +2035,7 @@ -56 +61 @@ -1900,7 +2068,7 @@ -57 +62 @@ -1934,7 +2102,7 @@
 
-
Generated: 09.10.2023 - 11:13:29
+
Generated: 10.10.2023 - 13:31:11
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst index e7468938..e8fee5b9 100644 --- a/test/JPP_TestUsecases.rst +++ b/test/JPP_TestUsecases.rst @@ -45,6 +45,16 @@ Test Use Cases ---- +* **Test JPP_0005** + + [DATA_TYPES / GOODCASE] + + **JSON file with string values containing dollar operators** + + Expected: All parameters referenced by dollar operator are resolved correctly, outcome is a string containing the values of all referenced parameters + +---- + * **Test JPP_0100** [DATA_INTEGRITY / GOODCASE] @@ -135,6 +145,16 @@ Test Use Cases ---- +* **Test JPP_0207** + + [PARAMETER_SUBSTITUTION / GOODCASE] + + **JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation** + + Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + +---- + * **Test JPP_0250** [PARAMETER_SUBSTITUTION / BADCASE] @@ -323,6 +343,30 @@ Test Use Cases ---- +* **Test JPP_0355** + + [VALUE_DETECTION / BADCASE] + + **JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 3)** + + Expected: No values are returned, and JsonPreprocessor throws an exception + + *Hint: Checklist rule 2 / pattern 3* + +---- + +* **Test JPP_0356** + + [VALUE_DETECTION / BADCASE] + + **JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 4)** + + Expected: No values are returned, and JsonPreprocessor throws an exception + + *Hint: Checklist rule 2 / pattern 4* + +---- + * **Test JPP_0357** [VALUE_DETECTION / BADCASE] @@ -335,6 +379,18 @@ Test Use Cases ---- +* **Test JPP_0358** + + [VALUE_DETECTION / BADCASE] + + **JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6)** + + Expected: No values are returned, and JsonPreprocessor throws an exception + + *Hint: Checklist rule 2 / pattern 6* + +---- + * **Test JPP_0359** [VALUE_DETECTION / BADCASE] @@ -629,5 +685,5 @@ Test Use Cases ---- -Generated: 09.10.2023 - 11:13:29 +Generated: 10.10.2023 - 13:31:11 diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt index 98c16439..04b2fa9d 100644 --- a/test/JPP_TestUsecases.txt +++ b/test/JPP_TestUsecases.txt @@ -27,6 +27,10 @@ Test JPP_0003 / DATA_TYPES / GOODCASE Description: JSON file containing parameters with dollar operator syntax at right hand side of colon, composite data type: list Expectation: All parameters referenced by dollar operator are resolved correctly, with their correct data types ------------------------------------------------------------------------------------------------------------------------ +Test JPP_0005 / DATA_TYPES / GOODCASE +Description: JSON file with string values containing dollar operators +Expectation: All parameters referenced by dollar operator are resolved correctly, outcome is a string containing the values of all referenced parameters +------------------------------------------------------------------------------------------------------------------------ Test JPP_0100 / DATA_INTEGRITY / GOODCASE Description: JSON file is empty (single pair of brackets only) Expectation: JsonPreprocessor returns empty dictionary @@ -63,6 +67,10 @@ Test JPP_0205 / PARAMETER_SUBSTITUTION / GOODCASE Description: JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------ +Test JPP_0207 / PARAMETER_SUBSTITUTION / GOODCASE +Description: JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation +Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string +------------------------------------------------------------------------------------------------------------------------ Test JPP_0250 / PARAMETER_SUBSTITUTION / BADCASE Description: JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing Expectation: No values are returned, and JsonPreprocessor throws an exception @@ -140,11 +148,26 @@ Description: JSON file with expression containing more opening elements '${' tha Expectation: No values are returned, and JsonPreprocessor throws an exception Hint.......: Checklist rule 2 / pattern 2 ------------------------------------------------------------------------------------------------------------------------ +Test JPP_0355 / VALUE_DETECTION / BADCASE +Description: JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 3) +Expectation: No values are returned, and JsonPreprocessor throws an exception +Hint.......: Checklist rule 2 / pattern 3 +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0356 / VALUE_DETECTION / BADCASE +Description: JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 4) +Expectation: No values are returned, and JsonPreprocessor throws an exception +Hint.......: Checklist rule 2 / pattern 4 +------------------------------------------------------------------------------------------------------------------------ Test JPP_0357 / VALUE_DETECTION / BADCASE Description: JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 5) Expectation: No values are returned, and JsonPreprocessor throws an exception Hint.......: Checklist rule 2 / pattern 5 ------------------------------------------------------------------------------------------------------------------------ +Test JPP_0358 / VALUE_DETECTION / BADCASE +Description: JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6) +Expectation: No values are returned, and JsonPreprocessor throws an exception +Hint.......: Checklist rule 2 / pattern 6 +------------------------------------------------------------------------------------------------------------------------ Test JPP_0359 / VALUE_DETECTION / BADCASE Description: JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6) Expectation: No values are returned, and JsonPreprocessor throws an exception @@ -265,5 +288,5 @@ Description: Relative path to JSON file Expectation: JsonPreprocessor resolves the relative path and returns values from JSON file Hint.......: Works with raw path to JSON file (path not normalized internally) ------------------------------------------------------------------------------------------------------------------------ -Generated: 09.10.2023 - 11:13:29 +Generated: 10.10.2023 - 13:31:11 diff --git a/test/component_test.py b/test/component_test.py index 085031dd..d7fa72b4 100644 --- a/test/component_test.py +++ b/test/component_test.py @@ -22,8 +22,8 @@ # # -------------------------------------------------------------------------------------------------------------- # -VERSION = "0.15.0" -VERSION_DATE = "09.10.2023" +VERSION = "0.16.0" +VERSION_DATE = "10.10.2023" # # -------------------------------------------------------------------------------------------------------------- #TM*** diff --git a/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py b/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py index 28f210e9..7700bea0 100644 --- a/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py +++ b/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 09.08.2023 - 17:28:15 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- @@ -53,4 +53,12 @@ def test_JPP_0002(self, Description): def test_JPP_0003(self, Description): nReturn = CExecute.Execute("JPP_0003") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: All parameters referenced by dollar operator are resolved correctly, outcome is a string containing the values of all referenced parameters + @pytest.mark.parametrize( + "Description", ["JSON file with string values containing dollar operators",] + ) + def test_JPP_0005(self, Description): + nReturn = CExecute.Execute("JPP_0005") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py b/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py index 5158e546..58ee45a0 100644 --- a/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py +++ b/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 09.08.2023 - 17:28:15 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py b/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py index e9b8ee45..e9ad6163 100644 --- a/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 09.10.2023 - 11:13:29 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- @@ -77,4 +77,12 @@ def test_JPP_0204(self, Description): def test_JPP_0205(self, Description): nReturn = CExecute.Execute("JPP_0205") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + @pytest.mark.parametrize( + "Description", ["JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation",] + ) + def test_JPP_0207(self, Description): + nReturn = CExecute.Execute("JPP_0207") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py b/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py index 36b834ff..9087124c 100644 --- a/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py +++ b/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 13.09.2023 - 10:58:36 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py b/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py index e8841a91..6e5ec073 100644 --- a/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 13.09.2023 - 10:58:36 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py b/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py index f05ae9f6..34b47d4e 100644 --- a/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py +++ b/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 13.09.2023 - 10:58:36 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- @@ -69,6 +69,22 @@ def test_JPP_0353(self, Description): def test_JPP_0354(self, Description): nReturn = CExecute.Execute("JPP_0354") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 3)",] + ) + def test_JPP_0355(self, Description): + nReturn = CExecute.Execute("JPP_0355") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 4)",] + ) + def test_JPP_0356(self, Description): + nReturn = CExecute.Execute("JPP_0356") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( @@ -77,6 +93,14 @@ def test_JPP_0354(self, Description): def test_JPP_0357(self, Description): nReturn = CExecute.Execute("JPP_0357") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with expression containing more opening elements '${' than closing elements '}' (invalid syntax 6)",] + ) + def test_JPP_0358(self, Description): + nReturn = CExecute.Execute("JPP_0358") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( diff --git a/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py b/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py index 1c77f1d2..9d8bf3bd 100644 --- a/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 04.10.2023 - 17:39:40 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py b/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py index 86ceae60..91d5a125 100644 --- a/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py +++ b/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 13.09.2023 - 10:58:36 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_09_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py b/test/pytest/pytestfiles/test_09_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py index d9a32821..ac77dc18 100644 --- a/test/pytest/pytestfiles/test_09_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_09_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 13.09.2023 - 10:58:36 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py b/test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py index 8a20da13..015e71b2 100644 --- a/test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py +++ b/test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 13.09.2023 - 10:58:36 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py b/test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py index f4f95f6f..f093afa9 100644 --- a/test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 05.10.2023 - 14:27:02 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_12_CYCLIC_IMPORTS_BADCASE.py b/test/pytest/pytestfiles/test_12_CYCLIC_IMPORTS_BADCASE.py index a0d15c9f..7601d111 100644 --- a/test/pytest/pytestfiles/test_12_CYCLIC_IMPORTS_BADCASE.py +++ b/test/pytest/pytestfiles/test_12_CYCLIC_IMPORTS_BADCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 28.09.2023 - 15:28:52 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_13_PATH_FORMATS_GOODCASE.py b/test/pytest/pytestfiles/test_13_PATH_FORMATS_GOODCASE.py index d2a9ee68..e5d97ecf 100644 --- a/test/pytest/pytestfiles/test_13_PATH_FORMATS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_13_PATH_FORMATS_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-CT/ECA3-Queckenstedt # -# 29.09.2023 - 15:06:38 +# 10.10.2023 - 13:31:11 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/testconfig/TestConfig.py b/test/testconfig/TestConfig.py index d99499cb..dbe1393f 100644 --- a/test/testconfig/TestConfig.py +++ b/test/testconfig/TestConfig.py @@ -22,7 +22,7 @@ # # -------------------------------------------------------------------------------------------------------------- # -# 09.10.2023 +# 10.10.2023 # # !!! Temporarily tests are deactivated by the following line commented out: # # # listofdictUsecases.append(dictUsecase) @@ -492,8 +492,68 @@ dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0005.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +dictUsecase['EXPECTEDRETURN'] = """ +[DICT] (59/1) > {param_01} [STR] : 'string' +[DICT] (59/2) > {param_02} [INT] : 123 +[DICT] (59/3) > {param_03} [STR] : '123' +[DICT] (59/4) > {param_04} [FLOAT] : 4.56 +[DICT] (59/5) > {param_05} [STR] : '4.56' +[DICT] (59/6) > {param_06} [BOOL] : True +[DICT] (59/7) > {param_07} [STR] : 'true' +[DICT] (59/8) > {param_08} [BOOL] : False +[DICT] (59/9) > {param_09} [STR] : 'false' +[DICT] (59/10) > {param_10} [NONE] : None +[DICT] (59/11) > {param_11} [STR] : 'null' +[DICT] (59/12) > {param_12} [BOOL] : True +[DICT] (59/13) > {param_13} [STR] : 'True' +[DICT] (59/14) > {param_14} [BOOL] : False +[DICT] (59/15) > {param_15} [STR] : 'False' +[DICT] (59/16) > {param_16} [NONE] : None +[DICT] (59/17) > {param_17} [STR] : 'None' +[DICT] (59/18) > {param_18} [STR] : 'string' +[DICT] (59/19) > {param_19} [STR] : 'string' +[DICT] (59/20) > {param_20} [INT] : 123 +[DICT] (59/21) > {param_21} [STR] : '123' +[DICT] (59/22) > {param_22} [STR] : '123' +[DICT] (59/23) > {param_23} [STR] : '123' +[DICT] (59/24) > {param_24} [FLOAT] : 4.56 +[DICT] (59/25) > {param_25} [STR] : '4.56' +[DICT] (59/26) > {param_26} [STR] : '4.56' +[DICT] (59/27) > {param_27} [STR] : '4.56' +[DICT] (59/28) > {param_28} [BOOL] : True +[DICT] (59/29) > {param_29} [STR] : 'True' +[DICT] (59/30) > {param_30} [STR] : 'true' +[DICT] (59/31) > {param_31} [STR] : 'true' +[DICT] (59/32) > {param_32} [BOOL] : False +[DICT] (59/33) > {param_33} [STR] : 'False' +[DICT] (59/34) > {param_34} [STR] : 'false' +[DICT] (59/35) > {param_35} [STR] : 'false' +[DICT] (59/36) > {param_36} [NONE] : None +[DICT] (59/37) > {param_37} [STR] : 'None' +[DICT] (59/38) > {param_38} [STR] : 'null' +[DICT] (59/39) > {param_39} [STR] : 'null' +[DICT] (59/40) > {param_40} [BOOL] : True +[DICT] (59/41) > {param_41} [STR] : 'True' +[DICT] (59/42) > {param_42} [STR] : 'True' +[DICT] (59/43) > {param_43} [STR] : 'True' +[DICT] (59/44) > {param_44} [BOOL] : False +[DICT] (59/45) > {param_45} [STR] : 'False' +[DICT] (59/46) > {param_46} [STR] : 'False' +[DICT] (59/47) > {param_47} [STR] : 'False' +[DICT] (59/48) > {param_48} [NONE] : None +[DICT] (59/49) > {param_49} [STR] : 'None' +[DICT] (59/50) > {param_50} [STR] : 'None' +[DICT] (59/51) > {param_51} [STR] : 'None' +[DICT] (59/52) > {param_201} [STR] : '01: string / 02: 123 / 03: 123 / 04: 4.56 / 05: 4.56 / 06: True / 07: true' +[DICT] (59/53) > {param_202} [STR] : '08: False / 09: false / 10: None / 11: null / 12: True / 13: True / 14: False' +[DICT] (59/54) > {param_203} [STR] : '15: False / 16: None / 17: None / 18: string / 19: string / 20: 123 / 21: 123' +[DICT] (59/55) > {param_204} [STR] : '22: 123 / 23: 123 / 24: 4.56 / 25: 4.56 / 26: 4.56 / 27: 4.56 / 28: True' +[DICT] (59/56) > {param_205} [STR] : '29: True / 30: true / 31: true / 32: False / 33: False / 34: false / 35: false' +[DICT] (59/57) > {param_206} [STR] : '36: None / 37: None / 38: null / 39: null / 40: True / 41: True / 42: True' +[DICT] (59/58) > {param_207} [STR] : '43: True / 44: False / 45: False / 46: False / 47: False / 48: None / 49: None' +[DICT] (59/59) > {param_208} [STR] : '50: None / 51: None' +""" +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------------- @@ -879,7 +939,7 @@ [DICT] (22/21) > {milestone} [STR] : 'milestone' [DICT] (22/22) > {VAR_VARIANT_1_MS_MILESTONE_2_param} [STR] : 'value' """ -# # # listofdictUsecases.append(dictUsecase) +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1425,9 +1485,9 @@ dictUsecase['HINT'] = "Checklist rule 2 / pattern 3" dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0355.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "invalid syntax (placeholder)" +dictUsecase['EXPECTEDEXCEPTION'] = "Invalid nested parameter format" dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1439,9 +1499,9 @@ dictUsecase['HINT'] = "Checklist rule 2 / pattern 4" dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0356.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "invalid syntax (placeholder)" +dictUsecase['EXPECTEDEXCEPTION'] = "An opened or closed curly brackets are missing in value" dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1467,9 +1527,9 @@ dictUsecase['HINT'] = "Checklist rule 2 / pattern 6" dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0358.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "invalid syntax (placeholder)" +dictUsecase['EXPECTEDEXCEPTION'] = "An opened or closed curly brackets are missing in value" # wording to be improved (issues/109) dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {}