diff --git a/test/JPP_TestUsecases.csv b/test/JPP_TestUsecases.csv index d526aa3..4cbf5d3 100644 --- a/test/JPP_TestUsecases.csv +++ b/test/JPP_TestUsecases.csv @@ -67,12 +67,13 @@ JPP_0369|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' an JPP_0370|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' and ending with '}', further matching '${' and '}' in between (not all nested) (invalid syntax 4) JPP_0371|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' and ending with '}', further matching '${' and '}' in between (not all nested) (invalid syntax 5) JPP_0400|NAMING_CONVENTION|GOODCASE|JSON file with several parameter names w.r.t. the naming convention -JPP_0450|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (1) -JPP_0451|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (2) -JPP_0452|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (3) -JPP_0453|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (4) -JPP_0454|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (5) -JPP_0455|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (6) +JPP_0401|NAMING_CONVENTION|GOODCASE|JSON file with several parameter names containing: blank, backslash, Unicode letters and decimal digits +JPP_0459|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (10) +JPP_0460|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (11) +JPP_0461|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (12) +JPP_0462|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (13) +JPP_0463|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (14) +JPP_0464|NAMING_CONVENTION|BADCASE|JSON file with several invalid parameter names (15) JPP_0500|COMPOSITE_EXPRESSIONS|GOODCASE|JSON file with composite data structure (nested lists and dictionaries 1) JPP_0501|COMPOSITE_EXPRESSIONS|GOODCASE|JSON file with composite data structure (nested lists and dictionaries 2) JPP_0502|COMPOSITE_EXPRESSIONS|GOODCASE|JSON file with composite data structure (nested lists and dictionaries 3 / some key names with dots inside) @@ -138,8 +139,6 @@ JPP_1154|FILE_IMPORTS|BADCASE|JSON file with not existing parameter within dynam JPP_1155|FILE_IMPORTS|BADCASE|JSON file with not existing import file JPP_1156|FILE_IMPORTS|BADCASE|JSON file with syntax error in import path (1) JPP_1157|FILE_IMPORTS|BADCASE|JSON file with syntax error in import path (2) -JPP_1158|FILE_IMPORTS|BADCASE|JSON file with error in [import] key (1) -JPP_1159|FILE_IMPORTS|BADCASE|JSON file with error in [import] key (2) JPP_1160|FILE_IMPORTS|BADCASE|JSON file with error in imported file JPP_1161|FILE_IMPORTS|BADCASE|JSON file with invalid data type of [import] key (1) JPP_1162|FILE_IMPORTS|BADCASE|JSON file with invalid data type of [import] key (2) @@ -199,6 +198,7 @@ JPP_2051|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing s JPP_2052|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (3) JPP_2053|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (4) JPP_2054|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (5) +JPP_2055|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (6) JPP_2056|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (7) JPP_2057|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (8) JPP_2058|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (9) diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html index 081a64c..d201679 100644 --- a/test/JPP_TestUsecases.html +++ b/test/JPP_TestUsecases.html @@ -2275,7 +2275,7 @@ -JPP_0450 +JPP_0401 @@ -2284,14 +2284,14 @@ - -BADCASE + +GOODCASE -JSON file with several invalid parameter names (1)
-Expected: Expected: No values are returned, and JsonPreprocessor throws an exception +JSON file with several parameter names containing: blank, backslash, Unicode letters and decimal digits
+Expected: All names are accepted (in definition and in reference) @@ -2308,7 +2308,7 @@ -JPP_0451 +JPP_0459 @@ -2323,7 +2323,7 @@ -JSON file with several invalid parameter names (2)
+JSON file with several invalid parameter names (10)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception @@ -2341,7 +2341,7 @@ -JPP_0452 +JPP_0460 @@ -2356,7 +2356,7 @@ -JSON file with several invalid parameter names (3)
+JSON file with several invalid parameter names (11)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception @@ -2374,7 +2374,7 @@ -JPP_0453 +JPP_0461 @@ -2389,7 +2389,7 @@ -JSON file with several invalid parameter names (4)
+JSON file with several invalid parameter names (12)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception @@ -2407,7 +2407,7 @@ -JPP_0454 +JPP_0462 @@ -2422,7 +2422,7 @@ -JSON file with several invalid parameter names (5)
+JSON file with several invalid parameter names (13)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception @@ -2440,7 +2440,7 @@ -JPP_0455 +JPP_0463 @@ -2455,7 +2455,7 @@ -JSON file with several invalid parameter names (6)
+JSON file with several invalid parameter names (14)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception @@ -2470,6 +2470,39 @@ 74 + + + +JPP_0464 + + + + +NAMING_CONVENTION + + + + +BADCASE + + + + +JSON file with several invalid parameter names (15)
+Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + + + + + + + + + + +75 + + @@ -2501,7 +2534,7 @@ -75 +76 @@ -2535,7 +2568,7 @@ -76 +77 @@ -2569,7 +2602,7 @@ -77 +78 @@ -2602,7 +2635,7 @@ -78 +79 @@ -2635,7 +2668,7 @@ -79 +80 @@ -2668,7 +2701,7 @@ -80 +81 @@ -2701,7 +2734,7 @@ -81 +82 @@ -2734,7 +2767,7 @@ -82 +83 @@ -2767,7 +2800,7 @@ -83 +84 @@ -2800,7 +2833,7 @@ -84 +85 @@ -2833,7 +2866,7 @@ -85 +86 @@ -2866,7 +2899,7 @@ -86 +87 @@ -2899,7 +2932,7 @@ -87 +88 @@ -2932,7 +2965,7 @@ -88 +89 @@ -2965,7 +2998,7 @@ -89 +90 @@ -2998,7 +3031,7 @@ -90 +91 @@ -3031,7 +3064,7 @@ -91 +92 @@ -3065,7 +3098,7 @@ -92 +93 @@ -3099,7 +3132,7 @@ -93 +94 @@ -3132,7 +3165,7 @@ -94 +95 @@ -3165,7 +3198,7 @@ -95 +96 @@ -3198,7 +3231,7 @@ -96 +97 @@ -3231,7 +3264,7 @@ -97 +98 @@ -3264,7 +3297,7 @@ -98 +99 @@ -3297,7 +3330,7 @@ -99 +100 @@ -3330,7 +3363,7 @@ -100 +101 @@ -3363,7 +3396,7 @@ -101 +102 @@ -3396,7 +3429,7 @@ -102 +103 @@ -3429,7 +3462,7 @@ -103 +104 @@ -3462,7 +3495,7 @@ -104 +105 @@ -3495,7 +3528,7 @@ -105 +106 @@ -3528,7 +3561,7 @@ -106 +107 @@ -3561,7 +3594,7 @@ -107 +108 @@ -3594,7 +3627,7 @@ -108 +109 @@ -3627,7 +3660,7 @@ -109 +110 @@ -3660,7 +3693,7 @@ -110 +111 @@ -3693,7 +3726,7 @@ -111 +112 @@ -3726,7 +3759,7 @@ -112 +113 @@ -3759,7 +3792,7 @@ -113 +114 @@ -3792,7 +3825,7 @@ -114 +115 @@ -3825,7 +3858,7 @@ -115 +116 @@ -3858,7 +3891,7 @@ -116 +117 @@ -3891,7 +3924,7 @@ -117 +118 @@ -3924,7 +3957,7 @@ -118 +119 @@ -3957,7 +3990,7 @@ -119 +120 @@ -3990,7 +4023,7 @@ -120 +121 @@ -4023,7 +4056,7 @@ -121 +122 @@ -4056,7 +4089,7 @@ -122 +123 @@ -4089,7 +4122,7 @@ -123 +124 @@ -4122,7 +4155,7 @@ -124 +125 @@ -4156,7 +4189,7 @@ -125 +126 @@ -4190,7 +4223,7 @@ -126 +127 @@ -4223,7 +4256,7 @@ -127 +128 @@ -4256,7 +4289,7 @@ -128 +129 @@ -4289,7 +4322,7 @@ -129 +130 @@ -4322,7 +4355,7 @@ -130 +131 @@ -4355,7 +4388,7 @@ -131 +132 @@ -4389,7 +4422,7 @@ -132 +133 @@ -4423,7 +4456,7 @@ -133 +134 @@ -4457,7 +4490,7 @@ -134 +135 @@ -4491,7 +4524,7 @@ -135 +136 @@ -4524,7 +4557,7 @@ -136 +137 @@ -4557,7 +4590,7 @@ -137 +138 @@ -4590,7 +4623,7 @@ -138 +139 @@ -4618,39 +4651,6 @@ - - - - - -139 - - - - - -JPP_1158 - - - - -FILE_IMPORTS - - - - -BADCASE - - - - -JSON file with error in [import] key (1)
-Expected: No values are returned, and JsonPreprocessor throws an exception - - - - - @@ -4659,39 +4659,6 @@ 140 - - - -JPP_1159 - - - - -FILE_IMPORTS - - - - -BADCASE - - - - -JSON file with error in [import] key (2)
-Expected: No values are returned, and JsonPreprocessor throws an exception - - - - - - - - - - -141 - - @@ -4722,7 +4689,7 @@ -142 +141 @@ -4756,7 +4723,7 @@ -143 +142 @@ -4790,7 +4757,7 @@ -144 +143 @@ -4824,7 +4791,7 @@ -145 +144 @@ -4858,7 +4825,7 @@ -146 +145 @@ -4892,7 +4859,7 @@ -147 +146 @@ -4926,7 +4893,7 @@ -148 +147 @@ -4960,7 +4927,7 @@ -149 +148 @@ -4993,7 +4960,7 @@ -150 +149 @@ -5026,7 +4993,7 @@ -151 +150 @@ -5059,7 +5026,7 @@ -152 +151 @@ -5092,7 +5059,7 @@ -153 +152 @@ -5125,7 +5092,7 @@ -154 +153 @@ -5158,7 +5125,7 @@ -155 +154 @@ -5191,7 +5158,7 @@ -156 +155 @@ -5224,7 +5191,7 @@ -157 +156 @@ -5257,7 +5224,7 @@ -158 +157 @@ -5290,7 +5257,7 @@ -159 +158 @@ -5323,7 +5290,7 @@ -160 +159 @@ -5356,7 +5323,7 @@ -161 +160 @@ -5389,7 +5356,7 @@ -162 +161 @@ -5422,7 +5389,7 @@ -163 +162 @@ -5455,7 +5422,7 @@ -164 +163 @@ -5488,7 +5455,7 @@ -165 +164 @@ -5521,7 +5488,7 @@ -166 +165 @@ -5554,7 +5521,7 @@ -167 +166 @@ -5587,7 +5554,7 @@ -168 +167 @@ -5620,7 +5587,7 @@ -169 +168 @@ -5653,7 +5620,7 @@ -170 +169 @@ -5686,7 +5653,7 @@ -171 +170 @@ -5719,7 +5686,7 @@ -172 +171 @@ -5752,7 +5719,7 @@ -173 +172 @@ -5785,7 +5752,7 @@ -174 +173 @@ -5818,7 +5785,7 @@ -175 +174 @@ -5851,7 +5818,7 @@ -176 +175 @@ -5884,7 +5851,7 @@ -177 +176 @@ -5917,7 +5884,7 @@ -178 +177 @@ -5950,7 +5917,7 @@ -179 +178 @@ -5983,7 +5950,7 @@ -180 +179 @@ -6016,7 +5983,7 @@ -181 +180 @@ -6049,7 +6016,7 @@ -182 +181 @@ -6082,7 +6049,7 @@ -183 +182 @@ -6115,7 +6082,7 @@ -184 +183 @@ -6148,7 +6115,7 @@ -185 +184 @@ -6181,7 +6148,7 @@ -186 +185 @@ -6214,7 +6181,7 @@ -187 +186 @@ -6247,7 +6214,7 @@ -188 +187 @@ -6280,7 +6247,7 @@ -189 +188 @@ -6313,7 +6280,7 @@ -190 +189 @@ -6346,7 +6313,7 @@ -191 +190 @@ -6379,7 +6346,7 @@ -192 +191 @@ -6412,7 +6379,7 @@ -193 +192 @@ -6445,7 +6412,7 @@ -194 +193 @@ -6478,7 +6445,7 @@ -195 +194 @@ -6511,7 +6478,7 @@ -196 +195 @@ -6544,7 +6511,7 @@ -197 +196 @@ -6577,7 +6544,7 @@ -198 +197 @@ -6610,7 +6577,7 @@ -199 +198 @@ -6638,6 +6605,39 @@ + + + + + +199 + + + + + +JPP_2055 + + + + +PARAMETER_SCOPE + + + + +BADCASE + + + + +JSON file containing a parameter with missing scope (6)
+Expected: No values are returned, and JsonPreprocessor throws an exception + + + + + @@ -6742,7 +6742,7 @@
 
-
Generated: 09.01.2025 - 18:56:30
+
Generated: 10.04.2025 - 17:21:06
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst index 4c4763e..51ec9ce 100644 --- a/test/JPP_TestUsecases.rst +++ b/test/JPP_TestUsecases.rst @@ -739,61 +739,71 @@ Test Use Cases ---- -* **Test JPP_0450** +* **Test JPP_0401** + + [NAMING_CONVENTION / GOODCASE] + + **JSON file with several parameter names containing: blank, backslash, Unicode letters and decimal digits** + + Expected: All names are accepted (in definition and in reference) + +---- + +* **Test JPP_0459** [NAMING_CONVENTION / BADCASE] - **JSON file with several invalid parameter names (1)** + **JSON file with several invalid parameter names (10)** Expected: Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0451** +* **Test JPP_0460** [NAMING_CONVENTION / BADCASE] - **JSON file with several invalid parameter names (2)** + **JSON file with several invalid parameter names (11)** Expected: Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0452** +* **Test JPP_0461** [NAMING_CONVENTION / BADCASE] - **JSON file with several invalid parameter names (3)** + **JSON file with several invalid parameter names (12)** Expected: Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0453** +* **Test JPP_0462** [NAMING_CONVENTION / BADCASE] - **JSON file with several invalid parameter names (4)** + **JSON file with several invalid parameter names (13)** Expected: Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0454** +* **Test JPP_0463** [NAMING_CONVENTION / BADCASE] - **JSON file with several invalid parameter names (5)** + **JSON file with several invalid parameter names (14)** Expected: Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0455** +* **Test JPP_0464** [NAMING_CONVENTION / BADCASE] - **JSON file with several invalid parameter names (6)** + **JSON file with several invalid parameter names (15)** Expected: Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1471,26 +1481,6 @@ Test Use Cases ---- -* **Test JPP_1158** - - [FILE_IMPORTS / BADCASE] - - **JSON file with error in [import] key (1)** - - Expected: No values are returned, and JsonPreprocessor throws an exception - ----- - -* **Test JPP_1159** - - [FILE_IMPORTS / BADCASE] - - **JSON file with error in [import] key (2)** - - Expected: No values are returned, and JsonPreprocessor throws an exception - ----- - * **Test JPP_1160** [FILE_IMPORTS / BADCASE] @@ -2095,6 +2085,16 @@ Test Use Cases ---- +* **Test JPP_2055** + + [PARAMETER_SCOPE / BADCASE] + + **JSON file containing a parameter with missing scope (6)** + + Expected: No values are returned, and JsonPreprocessor throws an exception + +---- + * **Test JPP_2056** [PARAMETER_SCOPE / BADCASE] @@ -2125,5 +2125,5 @@ Test Use Cases ---- -Generated: 09.01.2025 - 18:56:30 +Generated: 10.04.2025 - 17:21:06 diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt index 5886a31..73e9a1c 100644 --- a/test/JPP_TestUsecases.txt +++ b/test/JPP_TestUsecases.txt @@ -310,28 +310,32 @@ Test JPP_0400 / NAMING_CONVENTION / GOODCASE Description: JSON file with several parameter names w.r.t. the naming convention Expectation: All names are accepted (in definition and in reference) ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0450 / NAMING_CONVENTION / BADCASE -Description: JSON file with several invalid parameter names (1) +Test JPP_0401 / NAMING_CONVENTION / GOODCASE +Description: JSON file with several parameter names containing: blank, backslash, Unicode letters and decimal digits +Expectation: All names are accepted (in definition and in reference) +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0459 / NAMING_CONVENTION / BADCASE +Description: JSON file with several invalid parameter names (10) Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0451 / NAMING_CONVENTION / BADCASE -Description: JSON file with several invalid parameter names (2) +Test JPP_0460 / NAMING_CONVENTION / BADCASE +Description: JSON file with several invalid parameter names (11) Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0452 / NAMING_CONVENTION / BADCASE -Description: JSON file with several invalid parameter names (3) +Test JPP_0461 / NAMING_CONVENTION / BADCASE +Description: JSON file with several invalid parameter names (12) Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0453 / NAMING_CONVENTION / BADCASE -Description: JSON file with several invalid parameter names (4) +Test JPP_0462 / NAMING_CONVENTION / BADCASE +Description: JSON file with several invalid parameter names (13) Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0454 / NAMING_CONVENTION / BADCASE -Description: JSON file with several invalid parameter names (5) +Test JPP_0463 / NAMING_CONVENTION / BADCASE +Description: JSON file with several invalid parameter names (14) Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0455 / NAMING_CONVENTION / BADCASE -Description: JSON file with several invalid parameter names (6) +Test JPP_0464 / NAMING_CONVENTION / BADCASE +Description: JSON file with several invalid parameter names (15) Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0500 / COMPOSITE_EXPRESSIONS / GOODCASE @@ -605,14 +609,6 @@ Test JPP_1157 / FILE_IMPORTS / BADCASE Description: JSON file with syntax error in import path (2) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Test JPP_1158 / FILE_IMPORTS / BADCASE -Description: JSON file with error in [import] key (1) -Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------- -Test JPP_1159 / FILE_IMPORTS / BADCASE -Description: JSON file with error in [import] key (2) -Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------- Test JPP_1160 / FILE_IMPORTS / BADCASE Description: JSON file with error in imported file Expectation: No values are returned, and JsonPreprocessor throws an exception @@ -856,6 +852,10 @@ Test JPP_2054 / PARAMETER_SCOPE / BADCASE Description: JSON file containing a parameter with missing scope (5) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ +Test JPP_2055 / PARAMETER_SCOPE / BADCASE +Description: JSON file containing a parameter with missing scope (6) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ Test JPP_2056 / PARAMETER_SCOPE / BADCASE Description: JSON file containing a parameter with missing scope (7) Expectation: No values are returned, and JsonPreprocessor throws an exception @@ -868,5 +868,5 @@ Test JPP_2058 / PARAMETER_SCOPE / BADCASE Description: JSON file containing a parameter with missing scope (9) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Generated: 09.01.2025 - 18:56:30 +Generated: 10.04.2025 - 17:21:06 diff --git a/test/component_test.py b/test/component_test.py index 4ae1183..fc53379 100644 --- a/test/component_test.py +++ b/test/component_test.py @@ -22,8 +22,8 @@ # # -------------------------------------------------------------------------------------------------------------- # -VERSION = "0.58.0" -VERSION_DATE = "25.02.2025" +VERSION = "0.59.0" +VERSION_DATE = "10.04.2025" # # -------------------------------------------------------------------------------------------------------------- #TM*** diff --git a/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py b/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py index d8fac78..c6fd9fd 100644 --- a/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py @@ -18,7 +18,7 @@ # # XC-HWP/ESW3-Queckenstedt # -# 25.10.2024 - 20:31:28 +# 10.04.2025 - 17:21:06 # # -------------------------------------------------------------------------------------------------------------- @@ -37,4 +37,12 @@ class Test_NAMING_CONVENTION_GOODCASE: def test_JPP_0400(self, Description): nReturn = CExecute.Execute("JPP_0400") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: All names are accepted (in definition and in reference) + @pytest.mark.parametrize( + "Description", ["JSON file with several parameter names containing: blank, backslash, Unicode letters and decimal digits",] + ) + def test_JPP_0401(self, Description): + nReturn = CExecute.Execute("JPP_0401") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_08_NAMING_CONVENTION_BADCASE.py b/test/pytest/pytestfiles/test_08_NAMING_CONVENTION_BADCASE.py index d40999b..86476eb 100644 --- a/test/pytest/pytestfiles/test_08_NAMING_CONVENTION_BADCASE.py +++ b/test/pytest/pytestfiles/test_08_NAMING_CONVENTION_BADCASE.py @@ -18,7 +18,7 @@ # # XC-HWP/ESW3-Queckenstedt # -# 09.01.2025 - 18:56:30 +# 10.04.2025 - 17:21:06 # # -------------------------------------------------------------------------------------------------------------- @@ -26,55 +26,55 @@ from pytestlibs.CExecute import CExecute # -------------------------------------------------------------------------------------------------------------- -# mas2hc: Commented out the Test_NAMING_CONVENTION_BADCASE test cases due to the comment out in TestConfig.py is not effective -# class Test_NAMING_CONVENTION_BADCASE: -# # -------------------------------------------------------------------------------------------------------------- -# # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception -# @pytest.mark.parametrize( -# "Description", ["JSON file with several invalid parameter names (1)",] -# ) -# def test_JPP_0450(self, Description): -# nReturn = CExecute.Execute("JPP_0450") -# assert nReturn == 0 -# # -------------------------------------------------------------------------------------------------------------- -# # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception -# @pytest.mark.parametrize( -# "Description", ["JSON file with several invalid parameter names (2)",] -# ) -# def test_JPP_0451(self, Description): -# nReturn = CExecute.Execute("JPP_0451") -# assert nReturn == 0 -# # -------------------------------------------------------------------------------------------------------------- -# # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception -# @pytest.mark.parametrize( -# "Description", ["JSON file with several invalid parameter names (3)",] -# ) -# def test_JPP_0452(self, Description): -# nReturn = CExecute.Execute("JPP_0452") -# assert nReturn == 0 -# # -------------------------------------------------------------------------------------------------------------- -# # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception -# @pytest.mark.parametrize( -# "Description", ["JSON file with several invalid parameter names (4)",] -# ) -# def test_JPP_0453(self, Description): -# nReturn = CExecute.Execute("JPP_0453") -# assert nReturn == 0 -# # -------------------------------------------------------------------------------------------------------------- -# # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception -# @pytest.mark.parametrize( -# "Description", ["JSON file with several invalid parameter names (5)",] -# ) -# def test_JPP_0454(self, Description): -# nReturn = CExecute.Execute("JPP_0454") -# assert nReturn == 0 -# # -------------------------------------------------------------------------------------------------------------- -# # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception -# @pytest.mark.parametrize( -# "Description", ["JSON file with several invalid parameter names (6)",] -# ) -# def test_JPP_0455(self, Description): -# nReturn = CExecute.Execute("JPP_0455") -# assert nReturn == 0 -# # -------------------------------------------------------------------------------------------------------------- +class Test_NAMING_CONVENTION_BADCASE: + +# -------------------------------------------------------------------------------------------------------------- + # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with several invalid parameter names (10)",] + ) + def test_JPP_0459(self, Description): + nReturn = CExecute.Execute("JPP_0459") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with several invalid parameter names (11)",] + ) + def test_JPP_0460(self, Description): + nReturn = CExecute.Execute("JPP_0460") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with several invalid parameter names (12)",] + ) + def test_JPP_0461(self, Description): + nReturn = CExecute.Execute("JPP_0461") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with several invalid parameter names (13)",] + ) + def test_JPP_0462(self, Description): + nReturn = CExecute.Execute("JPP_0462") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with several invalid parameter names (14)",] + ) + def test_JPP_0463(self, Description): + nReturn = CExecute.Execute("JPP_0463") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with several invalid parameter names (15)",] + ) + def test_JPP_0464(self, Description): + nReturn = CExecute.Execute("JPP_0464") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py b/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py index 64cfc17..71e2038 100644 --- a/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py +++ b/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py @@ -18,7 +18,7 @@ # # XC-HWP/ESW3-Queckenstedt # -# 26.11.2024 - 12:36:07 +# 10.04.2025 - 17:21:06 # # -------------------------------------------------------------------------------------------------------------- @@ -93,24 +93,6 @@ def test_JPP_1156(self, Description): def test_JPP_1157(self, Description): nReturn = CExecute.Execute("JPP_1157") assert nReturn == 0 -# -------------------------------------------------------------------------------------------------------------- - # Expected: No values are returned, and JsonPreprocessor throws an exception - # mas2hc: Commented out this test case due to the comment out in TestConfig.py is not effective - # @pytest.mark.parametrize( - # "Description", ["JSON file with error in [import] key (1)",] - # ) - # def test_JPP_1158(self, Description): - # nReturn = CExecute.Execute("JPP_1158") - # assert nReturn == 0 -# -------------------------------------------------------------------------------------------------------------- - # Expected: No values are returned, and JsonPreprocessor throws an exception - # mas2hc: Commented out this test case due to the comment out in TestConfig.py is not effective - # @pytest.mark.parametrize( - # "Description", ["JSON file with error in [import] key (2)",] - # ) - # def test_JPP_1159(self, Description): - # nReturn = CExecute.Execute("JPP_1159") - # assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( diff --git a/test/pytest/pytestfiles/test_26_PARAMETER_SCOPE_BADCASE.py b/test/pytest/pytestfiles/test_26_PARAMETER_SCOPE_BADCASE.py index 4bcda17..26505d7 100644 --- a/test/pytest/pytestfiles/test_26_PARAMETER_SCOPE_BADCASE.py +++ b/test/pytest/pytestfiles/test_26_PARAMETER_SCOPE_BADCASE.py @@ -18,7 +18,7 @@ # # XC-HWP/ESW3-Queckenstedt # -# 14.11.2024 - 15:38:04 +# 10.04.2025 - 17:21:06 # # -------------------------------------------------------------------------------------------------------------- @@ -69,6 +69,14 @@ def test_JPP_2053(self, Description): def test_JPP_2054(self, Description): nReturn = CExecute.Execute("JPP_2054") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file containing a parameter with missing scope (6)",] + ) + def test_JPP_2055(self, Description): + nReturn = CExecute.Execute("JPP_2055") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( diff --git a/test/testconfig/TestConfig.py b/test/testconfig/TestConfig.py index ed0ef96..e69d5b7 100644 --- a/test/testconfig/TestConfig.py +++ b/test/testconfig/TestConfig.py @@ -22,7 +22,7 @@ # # -------------------------------------------------------------------------------------------------------------- # -# 25.02.2025 +# 10.04.2025 # # !!! Temporarily tests are deactivated by the following line commented out: # # # listofdictUsecases.append(dictUsecase) @@ -1746,8 +1746,10 @@ del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} +# parts of jpp-test_config_0401.jsonp commented out because of +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/440 dictUsecase['TESTID'] = "JPP_0401" -dictUsecase['DESCRIPTION'] = "JSON file with several parameter names containing: blank, backslash, 4Byte character" +dictUsecase['DESCRIPTION'] = "JSON file with several parameter names containing: blank, backslash, Unicode letters and decimal digits" dictUsecase['EXPECTATION'] = "All names are accepted (in definition and in reference)" dictUsecase['SECTION'] = "NAMING_CONVENTION" dictUsecase['SUBSECTION'] = "GOODCASE" @@ -1756,8 +1758,43 @@ dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0401.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ +[DOTDICT] (27/1) > {param} [INT] : 1 +[DOTDICT] (27/2) > {p21} [INT] : 1 +[DOTDICT] (27/3) > {B} [DOTDICT] (1/1) > {param} [INT] : 1 +[DOTDICT] (27/4) > {p22} [INT] : 1 +[DOTDICT] (27/5) > {C} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (27/5) > {C} [LIST] (3/2) > [DOTDICT] (1/1) > {param} [INT] : 1 +[DOTDICT] (27/5) > {C} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (27/6) > {p23} [INT] : 1 +[DOTDICT] (27/7) > {par\\am} [INT] : 1 +[DOTDICT] (27/8) > {p24} [INT] : 1 +[DOTDICT] (27/9) > {path\\to\\file} [STR] : 'C:\\Users\\Example\\file.txt' +[DOTDICT] (27/10) > {par𠼭am} [INT] : 1 +[DOTDICT] (27/11) > {p27} [INT] : 1 +[DOTDICT] (27/12) > {F} [DOTDICT] (1/1) > {par𠼭am} [INT] : 1 +[DOTDICT] (27/13) > {p28} [INT] : 1 +[DOTDICT] (27/14) > {G} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (27/14) > {G} [LIST] (3/2) > [DOTDICT] (1/1) > {par𠼭am} [INT] : 1 +[DOTDICT] (27/14) > {G} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (27/15) > {p29} [INT] : 1 +[DOTDICT] (27/16) > {𠼭param} [INT] : 1 +[DOTDICT] (27/17) > {p30} [INT] : 1 +[DOTDICT] (27/18) > {H} [DOTDICT] (1/1) > {𠼭param} [INT] : 1 +[DOTDICT] (27/19) > {p31} [INT] : 1 +[DOTDICT] (27/20) > {K} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (27/20) > {K} [LIST] (3/2) > [DOTDICT] (1/1) > {𠼭param} [INT] : 1 +[DOTDICT] (27/20) > {K} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (27/21) > {p32} [INT] : 1 +[DOTDICT] (27/22) > {param൯} [INT] : 1 +[DOTDICT] (27/23) > {p33} [INT] : 1 +[DOTDICT] (27/24) > {L} [DOTDICT] (1/1) > {param൯} [INT] : 1 +[DOTDICT] (27/25) > {p34} [INT] : 1 +[DOTDICT] (27/26) > {M} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (27/26) > {M} [LIST] (3/2) > [DOTDICT] (1/1) > {param൯} [INT] : 1 +[DOTDICT] (27/26) > {M} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (27/27) > {p35} [INT] : 1 """ -# # # listofdictUsecases.append(dictUsecase) # several issues +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------------- @@ -1770,9 +1807,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0450.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """Invalid key name: "%A". Key names have to start with a letter, digit or underscore.""" -dictUsecase['EXPECTEDRETURN'] = None -# listofdictUsecases.append(dictUsecase) # temporarily deactivated because of rework of naming conventions +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1784,9 +1821,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0451.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """Invalid key name: "%A". Key names have to start with a letter, digit or underscore.""" -dictUsecase['EXPECTEDRETURN'] = None -# listofdictUsecases.append(dictUsecase) # temporarily deactivated because of rework of naming conventions +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1798,9 +1835,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0452.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """Invalid key name: "%A". Key names have to start with a letter, digit or underscore.""" -dictUsecase['EXPECTEDRETURN'] = None -# listofdictUsecases.append(dictUsecase) # temporarily deactivated because of rework of naming conventions +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1812,9 +1849,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0453.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """Invalid key name: "par%am".""" # error message to be extended -dictUsecase['EXPECTEDRETURN'] = None -# listofdictUsecases.append(dictUsecase) # temporarily deactivated because of rework of naming conventions +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1826,9 +1863,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0454.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """Invalid key name: "par%am".""" # error message to be extended -dictUsecase['EXPECTEDRETURN'] = None -# listofdictUsecases.append(dictUsecase) # temporarily deactivated because of rework of naming conventions +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1840,9 +1877,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0455.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """Invalid key name: "par%am".""" # error message to be extended -dictUsecase['EXPECTEDRETURN'] = None -# listofdictUsecases.append(dictUsecase) # temporarily deactivated because of rework of naming conventions +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1854,9 +1891,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0456.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # blanks inside name not allowed but currently accepted +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now (blanks allowed); TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1868,9 +1905,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0457.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # blanks inside name not allowed but currently accepted +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now (blanks allowed); TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1882,9 +1919,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0458.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # blanks inside name not allowed but currently accepted +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now (blanks allowed); TODO: move this test to GOODCASE section (JPP_0401) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1896,9 +1933,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0459.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO +dictUsecase['EXPECTEDEXCEPTION'] = "Empty key name detected. Please enter a valid name." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # empty name not allowed but currently accepted +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1910,9 +1947,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0460.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO +dictUsecase['EXPECTEDEXCEPTION'] = "Empty key name detected. Please enter a valid name." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # empty name not allowed but currently accepted +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1924,9 +1961,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0461.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO +dictUsecase['EXPECTEDEXCEPTION'] = "Empty key name detected. Please enter a valid name." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # empty name not allowed but currently accepted +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1938,9 +1975,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0462.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO +dictUsecase['EXPECTEDEXCEPTION'] = "Empty key name detected. Please enter a valid name." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # name contains blanks only, waiting for final error message +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1952,9 +1989,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0463.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO +dictUsecase['EXPECTEDEXCEPTION'] = "Empty key name detected. Please enter a valid name." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # name contains blanks only, waiting for final error message +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1966,9 +2003,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0464.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO +dictUsecase['EXPECTEDEXCEPTION'] = "Empty key name detected. Please enter a valid name." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # name contains blanks only, waiting for final error message +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1980,9 +2017,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0465.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # invalid name accepted and usage causes: 'local variable 'tmpList03' referenced before assignment'! +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -1994,9 +2031,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0466.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # TODO -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # invalid name accepted and usage causes: 'local variable 'tmpList03' referenced before assignment'! +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = None # TODO +# # # listofdictUsecases.append(dictUsecase) # 10.04.2025 / name is valid now; TODO: move this test to GOODCASE section del dictUsecase # -------------------------------------------------------------------------------------------------------------- @@ -3152,7 +3189,10 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = "Cyclic import" dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1150.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" +# temporary adaption +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/393#issuecomment-2792637445 +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic import detection while handling the file" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -3166,7 +3206,10 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = "Cyclic import" dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1151.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" +# temporary adaption +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/393#issuecomment-2792637445 +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic import detection while handling the file" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -3180,7 +3223,10 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = "Cyclic import" dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1152.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" +# temporary adaption +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/393#issuecomment-2792637445 +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic import detection while handling the file" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -3194,7 +3240,10 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = "Cyclic import" dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1153.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" +# temporary adaption +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/393#issuecomment-2792637445 +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic import detection while handling the file" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -3370,7 +3419,10 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = "Cyclic import" dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1165.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" # file list to be fixed +# temporary adaption +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/393#issuecomment-2792637445 +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic import detection while handling the file" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -3386,7 +3438,10 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = "Cyclic import" dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1166.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" # file list to be fixed +# temporary adaption +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# https://github.com/test-fullautomation/python-jsonpreprocessor/issues/393#issuecomment-2792637445 +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic import detection while handling the file" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4275,7 +4330,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2050.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'Could not resolve expression '${param}'. The based parameter 'param' is not defined yet! Use the ' : ' syntax to create a new based parameter.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'Could not resolve expression '${param}'. The based parameter 'param' is not defined yet! Use the ' : ' syntax to create a new based parameter.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4289,7 +4344,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2051.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'A key with name '${param}' does not exist at this position. Use the ' : ' syntax to create a new key.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'A key with name '${param}' does not exist at this position. Use the ' : ' syntax to create a new key.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4303,7 +4358,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2052.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'Missing scope for parameter '${param}'. To change the value of this parameter, an absolute path must be used: '${params}['001']['param']' or '${params.001.param}'.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'Missing scope for parameter '${param}'. To change the value of this parameter, an absolute path must be used: '${params}['001']['param']' or '${params.001.param}'.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4317,7 +4372,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2053.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'A key with name '${params}['001']' does not exist at this position. Use the ' : ' syntax to create a new key.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'A key with name '${params}['001']' does not exist at this position. Use the ' : ' syntax to create a new key.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4331,7 +4386,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2054.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'A key with name '${params.001}' does not exist at this position. Use the ' : ' syntax to create a new key.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'A key with name '${params.001}' does not exist at this position. Use the ' : ' syntax to create a new key.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4345,9 +4400,9 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2055.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDEXCEPTION'] = "Missing scope for parameter '${C}'. To change the value of this parameter, an absolute path must be used: '${params}[1]['B'][0]['C']' or '${params.1.B.0.C}'." dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) # https://github.com/test-fullautomation/python-jsonpreprocessor/issues/349 +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} @@ -4359,7 +4414,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2056.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'A key with name '${C}' does not exist at this position. Use the ' : ' syntax to create a new key.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'A key with name '${C}' does not exist at this position. Use the ' : ' syntax to create a new key.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4373,7 +4428,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2057.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'A key with name '${params}[1]['B'][0]['C']' does not exist at this position. Use the ' : ' syntax to create a new key.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'A key with name '${params}[1]['B'][0]['C']' does not exist at this position. Use the ' : ' syntax to create a new key.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -4387,7 +4442,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_2058.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = """'A key with name '${params.1.B.0.C}' does not exist at this position. Use the ' : ' syntax to create a new key.'""" +dictUsecase['EXPECTEDEXCEPTION'] = "'A key with name '${params.1.B.0.C}' does not exist at this position. Use the ' : ' syntax to create a new key.'" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase diff --git a/test/testfiles/jpp-test_config_0401.jsonp b/test/testfiles/jpp-test_config_0401.jsonp index bdd29d2..c9fae62 100644 --- a/test/testfiles/jpp-test_config_0401.jsonp +++ b/test/testfiles/jpp-test_config_0401.jsonp @@ -13,7 +13,7 @@ // limitations under the License. //************************************************************************** { - // -- blank, backslash, 4Byte character + // -- blank, backslash " param " : 1, "p21" : ${param}, // @@ -26,14 +26,16 @@ "par\\am" : 1, "p24" : ${par\\am}, // - "D" : {"par\\am" : 1}, - "p25" : ${D}['par\\am'], + // https://github.com/test-fullautomation/python-jsonpreprocessor/issues/440 + // "D" : {"par\\am" : 1}, + // "p25" : ${D}['par\\am'], // - "E" : [1, {"par\\am" : 1}, 2], - "p26" : ${E}[1]['par\\am'], + // "E" : [1, {"par\\am" : 1}, 2], + // "p26" : ${E}[1]['par\\am'], // - "path\\to\\file" : "C:\\Users\\Example\\file.txt" + "path\\to\\file" : "C:\\Users\\Example\\file.txt", // + // -- Unicode letters "par𠼭am" : 1, "p27" : ${par𠼭am}, // @@ -51,4 +53,15 @@ // "K" : [1, {"𠼭param" : 1}, 2], "p32" : ${K}[1]['𠼭param'], + // + // -- Unicode decimal digits + "param൯" : 1, + "p33" : ${param൯}, + // + "L" : {"param൯" : 1}, + "p34" : ${L}['param൯'], + // + "M" : [1, {"param൯" : 1}, 2], + "p35" : ${M}[1]['param൯'] } +