diff --git a/test/JPP_TestUsecases.csv b/test/JPP_TestUsecases.csv index f1377b55..a634dc27 100644 --- a/test/JPP_TestUsecases.csv +++ b/test/JPP_TestUsecases.csv @@ -10,34 +10,35 @@ JPP_0101|DATA_INTEGRITY|GOODCASE|JSON file with string containing several separa JPP_0102|DATA_INTEGRITY|GOODCASE|JSON file with string containing more special characters, masked special characters and escape sequences JPP_0103|DATA_INTEGRITY|GOODCASE|JSON file with strings containing several pairs of square brackets (that must not cause syntax issues!) JPP_0200|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / string parameter substitution in parameter value -JPP_0201|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / string parameter substitution in parameter name -JPP_0202|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter name / standard notation -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_0206|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter name / standard notation -JPP_0207|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation -JPP_0208|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation -JPP_0209|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation +JPP_0201|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation +JPP_0202|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation +JPP_0203|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation +JPP_0204|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / 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 -JPP_0253|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing -JPP_0254|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing -JPP_0255|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing -JPP_0256|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing -JPP_0257|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing -JPP_0258|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing -JPP_0259|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing -JPP_0260|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1) -JPP_0261|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2) -JPP_0262|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1) -JPP_0263|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2) -JPP_0264|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1) -JPP_0265|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2) -JPP_0266|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1) -JPP_0267|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2) -JPP_0270|PARAMETER_SUBSTITUTION|BADCASE|JSON file containing a list; list index is defined by a parameter and wrapped in single quotes +JPP_0251|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing +JPP_0252|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing +JPP_0253|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing +JPP_0254|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing +JPP_0255|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (1) +JPP_0256|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (2) +JPP_0257|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (3) +JPP_0258|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (4) +JPP_0259|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (5) +JPP_0260|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (6) +JPP_0261|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (7) +JPP_0262|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (8) +JPP_0263|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (9) +JPP_0264|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (1) +JPP_0265|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (2) +JPP_0266|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (3) +JPP_0267|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (4) +JPP_0268|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (5) +JPP_0269|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (6) +JPP_0270|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (7) +JPP_0271|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (8) +JPP_0272|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (9) +JPP_0273|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (10) +JPP_0274|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (11) JPP_0300|VALUE_DETECTION|GOODCASE|JSON file with parameter of type 'list' / index (in square brackets) defined outside the curly brackets (valid syntax) JPP_0301|VALUE_DETECTION|GOODCASE|JSON file with expression containing more closing elements '}' than opening elements '${' (valid syntax) JPP_0302|VALUE_DETECTION|GOODCASE|JSON file with expression starting with '${' and ending with '}' / no further matching '${' and '}' in between (valid syntax) diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html index 741b0964..88fdc751 100644 --- a/test/JPP_TestUsecases.html +++ b/test/JPP_TestUsecases.html @@ -382,7 +382,7 @@ -JSON file with nested parameter / string parameter substitution in parameter name
+JSON file with nested parameter / index parameter substitution in parameter value / standard notation
Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -415,7 +415,7 @@ -JSON file with nested parameter / index parameter substitution in parameter name / standard notation
+JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation
Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -448,7 +448,7 @@ -JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation
+JSON file with nested parameter / key parameter substitution in parameter value / standard notation
Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -481,7 +481,7 @@ -JSON file with nested parameter / index parameter substitution in parameter value / standard notation
+JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation
Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -499,7 +499,7 @@ -JPP_0205 +JPP_0250 @@ -508,14 +508,14 @@ - -GOODCASE + +BADCASE -JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation
-Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string +JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing
+Expected: No values are returned, and JsonPreprocessor throws an exception @@ -532,7 +532,7 @@ -JPP_0206 +JPP_0251 @@ -541,14 +541,14 @@ - -GOODCASE + +BADCASE -JSON file with nested parameter / key parameter substitution in parameter name / standard notation
-Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string +JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing
+Expected: No values are returned, and JsonPreprocessor throws an exception @@ -565,7 +565,7 @@ -JPP_0207 +JPP_0252 @@ -574,14 +574,14 @@ - -GOODCASE + +BADCASE -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 +JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing
+Expected: No values are returned, and JsonPreprocessor throws an exception @@ -598,7 +598,7 @@ -JPP_0208 +JPP_0253 @@ -607,14 +607,14 @@ - -GOODCASE + +BADCASE -JSON file with nested parameter / key parameter substitution in parameter value / standard notation
-Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string +JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing
+Expected: No values are returned, and JsonPreprocessor throws an exception @@ -631,7 +631,7 @@ -JPP_0209 +JPP_0254 @@ -640,14 +640,14 @@ - -GOODCASE + +BADCASE -JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation
-Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string +JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing
+Expected: No values are returned, and JsonPreprocessor throws an exception @@ -664,7 +664,7 @@ -JPP_0250 +JPP_0255 @@ -679,7 +679,7 @@ -JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing
+JSON file with substitution of blocked data types inside string values (1)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -697,7 +697,7 @@ -JPP_0251 +JPP_0256 @@ -712,7 +712,7 @@ -JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing
+JSON file with substitution of blocked data types inside string values (2)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -730,7 +730,7 @@ -JPP_0252 +JPP_0257 @@ -745,7 +745,7 @@ -JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing
+JSON file with substitution of blocked data types inside string values (3)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -763,7 +763,7 @@ -JPP_0253 +JPP_0258 @@ -778,7 +778,7 @@ -JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing
+JSON file with substitution of blocked data types inside string values (4)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -796,7 +796,7 @@ -JPP_0254 +JPP_0259 @@ -811,7 +811,7 @@ -JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing
+JSON file with substitution of blocked data types inside string values (5)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -829,7 +829,7 @@ -JPP_0255 +JPP_0260 @@ -844,7 +844,7 @@ -JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing
+JSON file with substitution of blocked data types inside string values (6)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -862,7 +862,7 @@ -JPP_0256 +JPP_0261 @@ -877,7 +877,7 @@ -JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing
+JSON file with substitution of blocked data types inside string values (7)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -895,7 +895,7 @@ -JPP_0257 +JPP_0262 @@ -910,7 +910,7 @@ -JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing
+JSON file with substitution of blocked data types inside string values (8)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -928,7 +928,7 @@ -JPP_0258 +JPP_0263 @@ -943,7 +943,7 @@ -JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing
+JSON file with substitution of blocked data types inside string values (9)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -961,7 +961,7 @@ -JPP_0259 +JPP_0264 @@ -976,7 +976,7 @@ -JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing
+JSON file with blocked dynamic key names (1)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -994,7 +994,7 @@ -JPP_0260 +JPP_0265 @@ -1009,7 +1009,7 @@ -JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1)
+JSON file with blocked dynamic key names (2)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1027,7 +1027,7 @@ -JPP_0261 +JPP_0266 @@ -1042,7 +1042,7 @@ -JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2)
+JSON file with blocked dynamic key names (3)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1060,7 +1060,7 @@ -JPP_0262 +JPP_0267 @@ -1075,7 +1075,7 @@ -JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1)
+JSON file with blocked dynamic key names (4)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1093,7 +1093,7 @@ -JPP_0263 +JPP_0268 @@ -1108,7 +1108,7 @@ -JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2)
+JSON file with blocked dynamic key names (5)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1126,7 +1126,7 @@ -JPP_0264 +JPP_0269 @@ -1141,7 +1141,7 @@ -JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1)
+JSON file with blocked dynamic key names (6)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1159,7 +1159,7 @@ -JPP_0265 +JPP_0270 @@ -1174,7 +1174,7 @@ -JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2)
+JSON file with blocked dynamic key names (7)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1192,7 +1192,7 @@ -JPP_0266 +JPP_0271 @@ -1207,7 +1207,7 @@ -JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1)
+JSON file with blocked dynamic key names (8)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1225,7 +1225,7 @@ -JPP_0267 +JPP_0272 @@ -1240,7 +1240,7 @@ -JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2)
+JSON file with blocked dynamic key names (9)
Expected: No values are returned, and JsonPreprocessor throws an exception @@ -1258,7 +1258,7 @@ -JPP_0270 +JPP_0273 @@ -1273,11 +1273,10 @@ -JSON file containing a list; list index is defined by a parameter and wrapped in single quotes
+JSON file with blocked dynamic key names (10)
Expected: No values are returned, and JsonPreprocessor throws an exception -
-List indices must be of type 'int' + @@ -1289,6 +1288,39 @@ 39 + + + +JPP_0274 + + + + +PARAMETER_SUBSTITUTION + + + + +BADCASE + + + + +JSON file with blocked dynamic key names (11)
+Expected: No values are returned, and JsonPreprocessor throws an exception + + + + + + + + + + +40 + + @@ -1320,7 +1352,7 @@ -40 +41 @@ -1354,7 +1386,7 @@ -41 +42 @@ -1388,7 +1420,7 @@ -42 +43 @@ -1422,7 +1454,7 @@ -43 +44 @@ -1456,7 +1488,7 @@ -44 +45 @@ -1490,7 +1522,7 @@ -45 +46 @@ -1524,7 +1556,7 @@ -46 +47 @@ -1558,7 +1590,7 @@ -47 +48 @@ -1592,7 +1624,7 @@ -48 +49 @@ -1626,7 +1658,7 @@ -49 +50 @@ -1660,7 +1692,7 @@ -50 +51 @@ -1694,7 +1726,7 @@ -51 +52 @@ -1728,7 +1760,7 @@ -52 +53 @@ -1762,7 +1794,7 @@ -53 +54 @@ -1796,7 +1828,7 @@ -54 +55 @@ -1830,7 +1862,7 @@ -55 +56 @@ -1864,7 +1896,7 @@ -56 +57 @@ -1898,7 +1930,7 @@ -57 +58 @@ -1932,7 +1964,7 @@ -58 +59 @@ -1966,7 +1998,7 @@ -59 +60 @@ -2000,7 +2032,7 @@ -60 +61 @@ -2034,7 +2066,7 @@ -61 +62 @@ -2068,7 +2100,7 @@ -62 +63 @@ -2102,7 +2134,7 @@ -63 +64 @@ -2136,7 +2168,7 @@ -64 +65 @@ -2170,7 +2202,7 @@ -65 +66 @@ -2204,7 +2236,7 @@ -66 +67 @@ -2238,7 +2270,7 @@ -67 +68 @@ -2272,7 +2304,7 @@ -68 +69 @@ -2306,7 +2338,7 @@ -69 +70 @@ -2339,7 +2371,7 @@ -70 +71 @@ -2372,7 +2404,7 @@ -71 +72 @@ -2405,7 +2437,7 @@ -72 +73 @@ -2438,7 +2470,7 @@ -73 +74 @@ -2471,7 +2503,7 @@ -74 +75 @@ -2504,7 +2536,7 @@ -75 +76 @@ -2537,7 +2569,7 @@ -76 +77 @@ -2570,7 +2602,7 @@ -77 +78 @@ -2603,7 +2635,7 @@ -78 +79 @@ -2636,7 +2668,7 @@ -79 +80 @@ -2669,7 +2701,7 @@ -80 +81 @@ -2702,7 +2734,7 @@ -81 +82 @@ -2735,7 +2767,7 @@ -82 +83 @@ -2768,7 +2800,7 @@ -83 +84 @@ -2802,7 +2834,7 @@ -84 +85 @@ -2836,7 +2868,7 @@ -85 +86 @@ -2869,7 +2901,7 @@ -86 +87 @@ -2902,7 +2934,7 @@ -87 +88 @@ -2935,7 +2967,7 @@ -88 +89 @@ -2968,7 +3000,7 @@ -89 +90 @@ -3001,7 +3033,7 @@ -90 +91 @@ -3034,7 +3066,7 @@ -91 +92 @@ -3067,7 +3099,7 @@ -92 +93 @@ -3100,7 +3132,7 @@ -93 +94 @@ -3133,7 +3165,7 @@ -94 +95 @@ -3166,7 +3198,7 @@ -95 +96 @@ -3199,7 +3231,7 @@ -96 +97 @@ -3232,7 +3264,7 @@ -97 +98 @@ -3265,7 +3297,7 @@ -98 +99 @@ -3298,7 +3330,7 @@ -99 +100 @@ -3331,7 +3363,7 @@ -100 +101 @@ -3364,7 +3396,7 @@ -101 +102 @@ -3397,7 +3429,7 @@ -102 +103 @@ -3430,7 +3462,7 @@ -103 +104 @@ -3463,7 +3495,7 @@ -104 +105 @@ -3496,7 +3528,7 @@ -105 +106 @@ -3529,7 +3561,7 @@ -106 +107 @@ -3562,7 +3594,7 @@ -107 +108 @@ -3595,7 +3627,7 @@ -108 +109 @@ -3628,7 +3660,7 @@ -109 +110 @@ -3661,7 +3693,7 @@ -110 +111 @@ -3694,7 +3726,7 @@ -111 +112 @@ -3728,7 +3760,7 @@ -112 +113 @@ -3761,7 +3793,7 @@ -113 +114 @@ -3794,7 +3826,7 @@ -114 +115 @@ -3827,7 +3859,7 @@ -115 +116 @@ -3860,7 +3892,7 @@ -116 +117 @@ -3893,7 +3925,7 @@ -117 +118 @@ -3926,7 +3958,7 @@ -118 +119 @@ -3959,7 +3991,7 @@ -119 +120 @@ -3992,7 +4024,7 @@ -120 +121 @@ -4025,7 +4057,7 @@ -121 +122 @@ -4058,7 +4090,7 @@ -122 +123 @@ -4091,7 +4123,7 @@ -123 +124 @@ -4124,7 +4156,7 @@ -124 +125 @@ -4157,7 +4189,7 @@ -125 +126 @@ -4190,7 +4222,7 @@ -126 +127 @@ -4223,7 +4255,7 @@ -127 +128 @@ -4256,7 +4288,7 @@ -128 +129 @@ -4289,7 +4321,7 @@ -129 +130 @@ -4322,7 +4354,7 @@ -130 +131 @@ -4355,7 +4387,7 @@ -131 +132 @@ -4388,7 +4420,7 @@ -132 +133 @@ -4421,7 +4453,7 @@ -133 +134 @@ -4454,7 +4486,7 @@ -134 +135 @@ -4487,7 +4519,7 @@ -135 +136 @@ -4520,7 +4552,7 @@ -136 +137 @@ -4553,7 +4585,7 @@ -137 +138 @@ -4586,7 +4618,7 @@ -138 +139 @@ -4619,7 +4651,7 @@ -139 +140 @@ -4652,7 +4684,7 @@ -140 +141 @@ -4685,7 +4717,7 @@ -141 +142 @@ -4718,7 +4750,7 @@ -142 +143 @@ -4751,7 +4783,7 @@ -143 +144 @@ -4784,7 +4816,7 @@ -144 +145 @@ -4817,7 +4849,7 @@ -145 +146 @@ -4850,7 +4882,7 @@ -146 +147 @@ -4883,7 +4915,7 @@ -147 +148 @@ -4916,7 +4948,7 @@ -148 +149 @@ -4949,7 +4981,7 @@ -149 +150 @@ -4982,7 +5014,7 @@
 
-
Generated: 17.04.2024 - 20:03:38
+
Generated: 22.10.2024 - 16:30:20
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst index e1848a4a..cc3fd857 100644 --- a/test/JPP_TestUsecases.rst +++ b/test/JPP_TestUsecases.rst @@ -119,7 +119,7 @@ Test Use Cases [PARAMETER_SUBSTITUTION / GOODCASE] - **JSON file with nested parameter / string parameter substitution in parameter name** + **JSON file with nested parameter / index parameter substitution in parameter value / standard notation** Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -129,7 +129,7 @@ Test Use Cases [PARAMETER_SUBSTITUTION / GOODCASE] - **JSON file with nested parameter / index parameter substitution in parameter name / standard notation** + **JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation** Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -139,7 +139,7 @@ Test Use Cases [PARAMETER_SUBSTITUTION / GOODCASE] - **JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation** + **JSON file with nested parameter / key parameter substitution in parameter value / standard notation** Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @@ -149,251 +149,259 @@ Test Use Cases [PARAMETER_SUBSTITUTION / GOODCASE] - **JSON file with nested parameter / index parameter substitution in parameter value / standard notation** + **JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation** Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ---- -* **Test JPP_0205** +* **Test JPP_0250** - [PARAMETER_SUBSTITUTION / GOODCASE] + [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation** + **JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing** - Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0206** +* **Test JPP_0251** - [PARAMETER_SUBSTITUTION / GOODCASE] + [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter name / standard notation** + **JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing** - Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0207** +* **Test JPP_0252** - [PARAMETER_SUBSTITUTION / GOODCASE] + [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation** + **JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing** - Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0208** +* **Test JPP_0253** - [PARAMETER_SUBSTITUTION / GOODCASE] + [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter value / standard notation** + **JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing** - Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0209** +* **Test JPP_0254** - [PARAMETER_SUBSTITUTION / GOODCASE] + [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation** + **JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing** - Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string + Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0250** +* **Test JPP_0255** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing** + **JSON file with substitution of blocked data types inside string values (1)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0251** +* **Test JPP_0256** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing** + **JSON file with substitution of blocked data types inside string values (2)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0252** +* **Test JPP_0257** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing** + **JSON file with substitution of blocked data types inside string values (3)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0253** +* **Test JPP_0258** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing** + **JSON file with substitution of blocked data types inside string values (4)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0254** +* **Test JPP_0259** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing** + **JSON file with substitution of blocked data types inside string values (5)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0255** +* **Test JPP_0260** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing** + **JSON file with substitution of blocked data types inside string values (6)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0256** +* **Test JPP_0261** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing** + **JSON file with substitution of blocked data types inside string values (7)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0257** +* **Test JPP_0262** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing** + **JSON file with substitution of blocked data types inside string values (8)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0258** +* **Test JPP_0263** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing** + **JSON file with substitution of blocked data types inside string values (9)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0259** +* **Test JPP_0264** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing** + **JSON file with blocked dynamic key names (1)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0260** +* **Test JPP_0265** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1)** + **JSON file with blocked dynamic key names (2)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0261** +* **Test JPP_0266** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2)** + **JSON file with blocked dynamic key names (3)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0262** +* **Test JPP_0267** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1)** + **JSON file with blocked dynamic key names (4)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0263** +* **Test JPP_0268** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2)** + **JSON file with blocked dynamic key names (5)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0264** +* **Test JPP_0269** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1)** + **JSON file with blocked dynamic key names (6)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0265** +* **Test JPP_0270** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2)** + **JSON file with blocked dynamic key names (7)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0266** +* **Test JPP_0271** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1)** + **JSON file with blocked dynamic key names (8)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0267** +* **Test JPP_0272** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2)** + **JSON file with blocked dynamic key names (9)** Expected: No values are returned, and JsonPreprocessor throws an exception ---- -* **Test JPP_0270** +* **Test JPP_0273** [PARAMETER_SUBSTITUTION / BADCASE] - **JSON file containing a list; list index is defined by a parameter and wrapped in single quotes** + **JSON file with blocked dynamic key names (10)** Expected: No values are returned, and JsonPreprocessor throws an exception - *Hint: List indices must be of type 'int'* +---- + +* **Test JPP_0274** + + [PARAMETER_SUBSTITUTION / BADCASE] + + **JSON file with blocked dynamic key names (11)** + + Expected: No values are returned, and JsonPreprocessor throws an exception ---- @@ -1573,5 +1581,5 @@ Test Use Cases ---- -Generated: 17.04.2024 - 20:03:38 +Generated: 22.10.2024 - 16:30:20 diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt index 21c6fd2d..acbd8ecc 100644 --- a/test/JPP_TestUsecases.txt +++ b/test/JPP_TestUsecases.txt @@ -56,38 +56,18 @@ Description: JSON file with nested parameter / string parameter substitution in Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------ Test JPP_0201 / PARAMETER_SUBSTITUTION / GOODCASE -Description: JSON file with nested parameter / string parameter substitution in parameter name -Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------- -Test JPP_0202 / PARAMETER_SUBSTITUTION / GOODCASE -Description: JSON file with nested parameter / index parameter substitution in parameter name / standard notation -Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------- -Test JPP_0203 / PARAMETER_SUBSTITUTION / GOODCASE -Description: JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation -Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------- -Test JPP_0204 / PARAMETER_SUBSTITUTION / GOODCASE Description: JSON file with nested parameter / index parameter substitution in parameter value / standard notation Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0205 / PARAMETER_SUBSTITUTION / GOODCASE +Test JPP_0202 / 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_0206 / PARAMETER_SUBSTITUTION / GOODCASE -Description: JSON file with nested parameter / key parameter substitution in parameter name / standard 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_0208 / PARAMETER_SUBSTITUTION / GOODCASE +Test JPP_0203 / PARAMETER_SUBSTITUTION / GOODCASE Description: JSON file with nested parameter / key parameter substitution in parameter value / standard notation Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------ -Test JPP_0209 / PARAMETER_SUBSTITUTION / GOODCASE +Test JPP_0204 / PARAMETER_SUBSTITUTION / GOODCASE Description: JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation Expectation: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string ------------------------------------------------------------------------------------------------------------------------ @@ -96,77 +76,100 @@ Description: JSON file with nested parameter / string parameter substitution in Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0251 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing +Description: JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0252 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing +Description: JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0253 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing +Description: JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0254 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing +Description: JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0255 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing +Description: JSON file with substitution of blocked data types inside string values (1) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0256 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing +Description: JSON file with substitution of blocked data types inside string values (2) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0257 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing +Description: JSON file with substitution of blocked data types inside string values (3) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0258 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing +Description: JSON file with substitution of blocked data types inside string values (4) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0259 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing +Description: JSON file with substitution of blocked data types inside string values (5) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0260 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1) +Description: JSON file with substitution of blocked data types inside string values (6) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0261 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2) +Description: JSON file with substitution of blocked data types inside string values (7) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0262 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1) +Description: JSON file with substitution of blocked data types inside string values (8) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0263 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2) +Description: JSON file with substitution of blocked data types inside string values (9) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0264 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1) +Description: JSON file with blocked dynamic key names (1) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0265 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2) +Description: JSON file with blocked dynamic key names (2) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0266 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1) +Description: JSON file with blocked dynamic key names (3) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0267 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2) +Description: JSON file with blocked dynamic key names (4) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0268 / PARAMETER_SUBSTITUTION / BADCASE +Description: JSON file with blocked dynamic key names (5) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0269 / PARAMETER_SUBSTITUTION / BADCASE +Description: JSON file with blocked dynamic key names (6) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ Test JPP_0270 / PARAMETER_SUBSTITUTION / BADCASE -Description: JSON file containing a list; list index is defined by a parameter and wrapped in single quotes +Description: JSON file with blocked dynamic key names (7) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0271 / PARAMETER_SUBSTITUTION / BADCASE +Description: JSON file with blocked dynamic key names (8) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0272 / PARAMETER_SUBSTITUTION / BADCASE +Description: JSON file with blocked dynamic key names (9) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0273 / PARAMETER_SUBSTITUTION / BADCASE +Description: JSON file with blocked dynamic key names (10) +Expectation: No values are returned, and JsonPreprocessor throws an exception +------------------------------------------------------------------------------------------------------------------------ +Test JPP_0274 / PARAMETER_SUBSTITUTION / BADCASE +Description: JSON file with blocked dynamic key names (11) Expectation: No values are returned, and JsonPreprocessor throws an exception -Hint.......: List indices must be of type 'int' ------------------------------------------------------------------------------------------------------------------------ Test JPP_0300 / VALUE_DETECTION / GOODCASE Description: JSON file with parameter of type 'list' / index (in square brackets) defined outside the curly brackets (valid syntax) @@ -645,5 +648,5 @@ Test JPP_1901 / ASSIGNMENTS_BY_REFERENCE / GOODCASE Description: JSON file with list assignments (by reference) Expectation: JsonPreprocessor returns expected value ------------------------------------------------------------------------------------------------------------------------ -Generated: 17.04.2024 - 20:03:38 +Generated: 22.10.2024 - 16:30:20 diff --git a/test/component_test.py b/test/component_test.py index 29ae1687..5f15997c 100644 --- a/test/component_test.py +++ b/test/component_test.py @@ -22,8 +22,8 @@ # # -------------------------------------------------------------------------------------------------------------- # -VERSION = "0.45.0" -VERSION_DATE = "17.04.2024" +VERSION = "0.46.0" +VERSION_DATE = "22.10.2024" # # -------------------------------------------------------------------------------------------------------------- #TM*** diff --git a/test/component_test_single.bat b/test/component_test_single.bat deleted file mode 100644 index 4e0db40c..00000000 --- a/test/component_test_single.bat +++ /dev/null @@ -1,40 +0,0 @@ -@echo off - -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0353;JPP_0354;JPP_0355;JPP_0356;JPP_0357;JPP_0358;JPP_0359;JPP_0360" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0361;JPP_0362;JPP_0363;JPP_0364;JPP_0365;JPP_0366" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0367;JPP_0368;JPP_0369;JPP_0370;JPP_0371" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0450;JPP_0451;JPP_0452;JPP_0453;JPP_0454;JPP_0455;JPP_0456;JPP_0457;JPP_0458" - -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0550;JPP_0900" --recreateinstance - - -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0004" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0268" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0450" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0504" - -"%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0515" - - - -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0507" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0508" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0509" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_1150" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0201;JPP_0900" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0201;JPP_0900" --recreateinstance - -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0457;JPP_0458;JPP_0500;JPP_0501" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --testid="JPP_0450;JPP_0457;JPP_0458;JPP_0500;JPP_0501" - - - - -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --codedump -REM "%RobotPythonPath%/python.exe" "D:/ROBFW/components/python-jsonpreprocessor/test/component_test.py" --configdump - -echo --------------------------------------- -echo component_test returned ERRORLEVEL : %ERRORLEVEL% -echo --------------------------------------- - diff --git a/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py b/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py index 0a3a7454..9bfde838 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 # -# 20.11.2023 - 15:42:16 +# 22.10.2024 - 16:30:20 # # -------------------------------------------------------------------------------------------------------------- @@ -40,7 +40,7 @@ def test_JPP_0200(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / string parameter substitution in parameter name",] + "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / standard notation",] ) def test_JPP_0201(self, Description): nReturn = CExecute.Execute("JPP_0201") @@ -48,7 +48,7 @@ def test_JPP_0201(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter name / standard notation",] + "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation",] ) def test_JPP_0202(self, Description): nReturn = CExecute.Execute("JPP_0202") @@ -56,7 +56,7 @@ def test_JPP_0202(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation",] + "Description", ["JSON file with nested parameter / key parameter substitution in parameter value / standard notation",] ) def test_JPP_0203(self, Description): nReturn = CExecute.Execute("JPP_0203") @@ -64,49 +64,9 @@ def test_JPP_0203(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: JsonPreprocessor creates a new string with all dollar operator expressions resolved as string @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / standard notation",] + "Description", ["JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation",] ) def test_JPP_0204(self, Description): nReturn = CExecute.Execute("JPP_0204") 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 / index parameter substitution in parameter value / dotdict notation",] - ) - 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 / standard notation",] - ) - def test_JPP_0206(self, Description): - nReturn = CExecute.Execute("JPP_0206") - 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 -# -------------------------------------------------------------------------------------------------------------- - # 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 value / standard notation",] - ) - def test_JPP_0208(self, Description): - nReturn = CExecute.Execute("JPP_0208") - 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 value / dotdict notation",] - ) - def test_JPP_0209(self, Description): - nReturn = CExecute.Execute("JPP_0209") - 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 e5b06561..edf79285 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 # -# 20.03.2024 - 17:07:31 +# 22.10.2024 - 16:30:20 # # -------------------------------------------------------------------------------------------------------------- @@ -40,7 +40,7 @@ def test_JPP_0250(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing",] + "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing",] ) def test_JPP_0251(self, Description): nReturn = CExecute.Execute("JPP_0251") @@ -48,7 +48,7 @@ def test_JPP_0251(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing",] + "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing",] ) def test_JPP_0252(self, Description): nReturn = CExecute.Execute("JPP_0252") @@ -56,7 +56,7 @@ def test_JPP_0252(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing",] + "Description", ["JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing",] ) def test_JPP_0253(self, Description): nReturn = CExecute.Execute("JPP_0253") @@ -64,7 +64,7 @@ def test_JPP_0253(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing",] + "Description", ["JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing",] ) def test_JPP_0254(self, Description): nReturn = CExecute.Execute("JPP_0254") @@ -72,7 +72,7 @@ def test_JPP_0254(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing",] + "Description", ["JSON file with substitution of blocked data types inside string values (1)",] ) def test_JPP_0255(self, Description): nReturn = CExecute.Execute("JPP_0255") @@ -80,7 +80,7 @@ def test_JPP_0255(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing",] + "Description", ["JSON file with substitution of blocked data types inside string values (2)",] ) def test_JPP_0256(self, Description): nReturn = CExecute.Execute("JPP_0256") @@ -88,7 +88,7 @@ def test_JPP_0256(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing",] + "Description", ["JSON file with substitution of blocked data types inside string values (3)",] ) def test_JPP_0257(self, Description): nReturn = CExecute.Execute("JPP_0257") @@ -96,7 +96,7 @@ def test_JPP_0257(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing",] + "Description", ["JSON file with substitution of blocked data types inside string values (4)",] ) def test_JPP_0258(self, Description): nReturn = CExecute.Execute("JPP_0258") @@ -104,7 +104,7 @@ def test_JPP_0258(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing",] + "Description", ["JSON file with substitution of blocked data types inside string values (5)",] ) def test_JPP_0259(self, Description): nReturn = CExecute.Execute("JPP_0259") @@ -112,7 +112,7 @@ def test_JPP_0259(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1)",] + "Description", ["JSON file with substitution of blocked data types inside string values (6)",] ) def test_JPP_0260(self, Description): nReturn = CExecute.Execute("JPP_0260") @@ -120,7 +120,7 @@ def test_JPP_0260(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2)",] + "Description", ["JSON file with substitution of blocked data types inside string values (7)",] ) def test_JPP_0261(self, Description): nReturn = CExecute.Execute("JPP_0261") @@ -128,7 +128,7 @@ def test_JPP_0261(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1)",] + "Description", ["JSON file with substitution of blocked data types inside string values (8)",] ) def test_JPP_0262(self, Description): nReturn = CExecute.Execute("JPP_0262") @@ -136,7 +136,7 @@ def test_JPP_0262(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2)",] + "Description", ["JSON file with substitution of blocked data types inside string values (9)",] ) def test_JPP_0263(self, Description): nReturn = CExecute.Execute("JPP_0263") @@ -144,7 +144,7 @@ def test_JPP_0263(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1)",] + "Description", ["JSON file with blocked dynamic key names (1)",] ) def test_JPP_0264(self, Description): nReturn = CExecute.Execute("JPP_0264") @@ -152,7 +152,7 @@ def test_JPP_0264(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2)",] + "Description", ["JSON file with blocked dynamic key names (2)",] ) def test_JPP_0265(self, Description): nReturn = CExecute.Execute("JPP_0265") @@ -160,7 +160,7 @@ def test_JPP_0265(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1)",] + "Description", ["JSON file with blocked dynamic key names (3)",] ) def test_JPP_0266(self, Description): nReturn = CExecute.Execute("JPP_0266") @@ -168,7 +168,7 @@ def test_JPP_0266(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2)",] + "Description", ["JSON file with blocked dynamic key names (4)",] ) def test_JPP_0267(self, Description): nReturn = CExecute.Execute("JPP_0267") @@ -176,9 +176,57 @@ def test_JPP_0267(self, Description): # -------------------------------------------------------------------------------------------------------------- # Expected: No values are returned, and JsonPreprocessor throws an exception @pytest.mark.parametrize( - "Description", ["JSON file containing a list; list index is defined by a parameter and wrapped in single quotes",] + "Description", ["JSON file with blocked dynamic key names (5)",] + ) + def test_JPP_0268(self, Description): + nReturn = CExecute.Execute("JPP_0268") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with blocked dynamic key names (6)",] + ) + def test_JPP_0269(self, Description): + nReturn = CExecute.Execute("JPP_0269") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with blocked dynamic key names (7)",] ) def test_JPP_0270(self, Description): nReturn = CExecute.Execute("JPP_0270") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with blocked dynamic key names (8)",] + ) + def test_JPP_0271(self, Description): + nReturn = CExecute.Execute("JPP_0271") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with blocked dynamic key names (9)",] + ) + def test_JPP_0272(self, Description): + nReturn = CExecute.Execute("JPP_0272") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with blocked dynamic key names (10)",] + ) + def test_JPP_0273(self, Description): + nReturn = CExecute.Execute("JPP_0273") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with blocked dynamic key names (11)",] + ) + def test_JPP_0274(self, Description): + nReturn = CExecute.Execute("JPP_0274") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- diff --git a/test/testconfig/TestConfig.py b/test/testconfig/TestConfig.py index 697902f1..60aee68d 100644 --- a/test/testconfig/TestConfig.py +++ b/test/testconfig/TestConfig.py @@ -22,7 +22,7 @@ # # -------------------------------------------------------------------------------------------------------------- # -# 17.04.2024 +# 22.10.2024 # # !!! Temporarily tests are deactivated by the following line commented out: # # # listofdictUsecases.append(dictUsecase) @@ -666,141 +666,13 @@ # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0201" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / string parameter substitution in parameter name" -dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) -dictUsecase['SUBSECTION'] = "GOODCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0201.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None -dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (21/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (21/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (21/3) > {list_variant_numbers} [LIST] (2/1) > [INT] : 1 -[DOTDICT] (21/3) > {list_variant_numbers} [LIST] (2/2) > [INT] : 2 -[DOTDICT] (21/4) > {list_variant_index} [INT] : 0 -[DOTDICT] (21/5) > {variant_number} [STR] : '1' -[DOTDICT] (21/6) > {dict_variants} [DOTDICT] (2/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (21/6) > {dict_variants} [DOTDICT] (2/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (21/7) > {variant_key_1} [STR] : 'variant_1' -[DOTDICT] (21/8) > {INNERMOST_VARIANT_VALUE} [STR] : 'RIA' -[DOTDICT] (21/9) > {ARIAN} [STR] : 'ARIAN' -[DOTDICT] (21/10) > {VARIANT} [STR] : 'VARIANT' -[DOTDICT] (21/11) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (21/12) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (21/13) > {list_milestone_numbers} [LIST] (3/1) > [INT] : 1 -[DOTDICT] (21/13) > {list_milestone_numbers} [LIST] (3/2) > [INT] : 2 -[DOTDICT] (21/13) > {list_milestone_numbers} [LIST] (3/3) > [INT] : 3 -[DOTDICT] (21/14) > {list_milestone_index} [INT] : 1 -[DOTDICT] (21/15) > {milestone_number} [STR] : '2' -[DOTDICT] (21/16) > {dict_milestones} [DOTDICT] (3/1) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (21/16) > {dict_milestones} [DOTDICT] (3/2) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (21/16) > {dict_milestones} [DOTDICT] (3/3) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (21/17) > {milestone_key_2} [STR] : 'milestone_2' -[DOTDICT] (21/18) > {innermost_milestone_name} [STR] : 'est' -[DOTDICT] (21/19) > {ilesto} [STR] : 'ilesto' -[DOTDICT] (21/20) > {milestone} [STR] : 'milestone' -[DOTDICT] (21/21) > {milestone_2} [STR] : 'MILESTONE_2 (new value)' -""" -listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0202" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter name / standard notation" -dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) -dictUsecase['SUBSECTION'] = "GOODCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0202.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None -dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/1) > [INT] : 1 -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/2) > [INT] : 2 -[DOTDICT] (22/4) > {list_variant_index} [INT] : 0 -[DOTDICT] (22/5) > {variant_number} [STR] : '1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/7) > {variant_key_1} [STR] : 'variant_1' -[DOTDICT] (22/8) > {INNERMOST_VARIANT_VALUE} [STR] : 'RIA' -[DOTDICT] (22/9) > {ARIAN} [STR] : 'ARIAN' -[DOTDICT] (22/10) > {VARIANT} [STR] : 'VARIANT' -[DOTDICT] (22/11) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/12) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/13) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/1) > [INT] : 1 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/2) > [INT] : 2 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/3) > [INT] : 3 -[DOTDICT] (22/15) > {list_milestone_index} [INT] : 1 -[DOTDICT] (22/16) > {milestone_number} [STR] : '2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/1) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/2) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/3) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/18) > {milestone_key_2} [STR] : 'milestone_2' -[DOTDICT] (22/19) > {innermost_milestone_name} [STR] : 'est' -[DOTDICT] (22/20) > {ilesto} [STR] : 'ilesto' -[DOTDICT] (22/21) > {milestone} [STR] : 'milestone' -[DOTDICT] (22/22) > {VAR_VARIANT_1_MS_MILESTONE_2_param} [STR] : 'value' -""" -listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0203" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation" -dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) -dictUsecase['SUBSECTION'] = "GOODCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0203.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None -dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/1) > [INT] : 1 -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/2) > [INT] : 2 -[DOTDICT] (22/4) > {list_variant_index} [INT] : 0 -[DOTDICT] (22/5) > {variant_number} [STR] : '1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/7) > {variant_key_1} [STR] : 'variant_1' -[DOTDICT] (22/8) > {INNERMOST_VARIANT_VALUE} [STR] : 'RIA' -[DOTDICT] (22/9) > {ARIAN} [STR] : 'ARIAN' -[DOTDICT] (22/10) > {VARIANT} [STR] : 'VARIANT' -[DOTDICT] (22/11) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/12) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/13) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/1) > [INT] : 1 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/2) > [INT] : 2 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/3) > [INT] : 3 -[DOTDICT] (22/15) > {list_milestone_index} [INT] : 1 -[DOTDICT] (22/16) > {milestone_number} [STR] : '2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/1) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/2) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/3) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/18) > {milestone_key_2} [STR] : 'milestone_2' -[DOTDICT] (22/19) > {innermost_milestone_name} [STR] : 'est' -[DOTDICT] (22/20) > {ilesto} [STR] : 'ilesto' -[DOTDICT] (22/21) > {milestone} [STR] : 'milestone' -[DOTDICT] (22/22) > {VAR_VARIANT_1_MS_MILESTONE_2_param} [STR] : 'value' -""" -listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0204" dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter value / standard notation" dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "GOODCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0204.jsonp" +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0201.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ [DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' @@ -836,14 +708,14 @@ del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0205" +dictUsecase['TESTID'] = "JPP_0202" dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation" dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "GOODCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0205.jsonp" +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0202.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ [DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' @@ -879,100 +751,14 @@ del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0206" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter name / standard notation" -dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) -dictUsecase['SUBSECTION'] = "GOODCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0206.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None -dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/1) > [INT] : 1 -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/2) > [INT] : 2 -[DOTDICT] (22/4) > {list_variant_index} [INT] : 0 -[DOTDICT] (22/5) > {variant_number} [STR] : '1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/7) > {variant_key_1} [STR] : 'variant_1' -[DOTDICT] (22/8) > {INNERMOST_VARIANT_VALUE} [STR] : 'RIA' -[DOTDICT] (22/9) > {ARIAN} [STR] : 'ARIAN' -[DOTDICT] (22/10) > {VARIANT} [STR] : 'VARIANT' -[DOTDICT] (22/11) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/12) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/13) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/1) > [INT] : 1 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/2) > [INT] : 2 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/3) > [INT] : 3 -[DOTDICT] (22/15) > {list_milestone_index} [INT] : 1 -[DOTDICT] (22/16) > {milestone_number} [STR] : '2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/1) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/2) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/3) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/18) > {milestone_key_2} [STR] : 'milestone_2' -[DOTDICT] (22/19) > {innermost_milestone_name} [STR] : 'est' -[DOTDICT] (22/20) > {ilesto} [STR] : 'ilesto' -[DOTDICT] (22/21) > {milestone} [STR] : 'milestone' -[DOTDICT] (22/22) > {VAR_VARIANT_1_MS_MILESTONE_2_param} [STR] : 'value' -""" -listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0207" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation" -dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) -dictUsecase['SUBSECTION'] = "GOODCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0207.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None -dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/1) > [INT] : 1 -[DOTDICT] (22/3) > {list_variant_numbers} [LIST] (2/2) > [INT] : 2 -[DOTDICT] (22/4) > {list_variant_index} [INT] : 0 -[DOTDICT] (22/5) > {variant_number} [STR] : '1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/1) > {variant_1} [STR] : 'VARIANT_1' -[DOTDICT] (22/6) > {dict_variants} [DOTDICT] (2/2) > {variant_2} [STR] : 'VARIANT_2' -[DOTDICT] (22/7) > {variant_key_1} [STR] : 'variant_1' -[DOTDICT] (22/8) > {INNERMOST_VARIANT_VALUE} [STR] : 'RIA' -[DOTDICT] (22/9) > {ARIAN} [STR] : 'ARIAN' -[DOTDICT] (22/10) > {VARIANT} [STR] : 'VARIANT' -[DOTDICT] (22/11) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/12) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/13) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/1) > [INT] : 1 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/2) > [INT] : 2 -[DOTDICT] (22/14) > {list_milestone_numbers} [LIST] (3/3) > [INT] : 3 -[DOTDICT] (22/15) > {list_milestone_index} [INT] : 1 -[DOTDICT] (22/16) > {milestone_number} [STR] : '2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/1) > {milestone_1} [STR] : 'MILESTONE_1' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/2) > {milestone_2} [STR] : 'MILESTONE_2' -[DOTDICT] (22/17) > {dict_milestones} [DOTDICT] (3/3) > {milestone_3} [STR] : 'MILESTONE_3' -[DOTDICT] (22/18) > {milestone_key_2} [STR] : 'milestone_2' -[DOTDICT] (22/19) > {innermost_milestone_name} [STR] : 'est' -[DOTDICT] (22/20) > {ilesto} [STR] : 'ilesto' -[DOTDICT] (22/21) > {milestone} [STR] : 'milestone' -[DOTDICT] (22/22) > {VAR_VARIANT_1_MS_MILESTONE_2_param} [STR] : 'value' -""" -listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0208" +dictUsecase['TESTID'] = "JPP_0203" dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter value / standard notation" dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "GOODCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0208.jsonp" +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0203.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ [DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' @@ -1008,14 +794,14 @@ del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0209" +dictUsecase['TESTID'] = "JPP_0204" dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation" dictUsecase['EXPECTATION'] = "JsonPreprocessor creates a new string with all dollar operator expressions resolved as string" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "GOODCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0209.jsonp" +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0204.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ [DOTDICT] (22/1) > {variant_1} [STR] : 'VARIANT_1' @@ -1050,7 +836,6 @@ listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- -# -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0250" dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing" @@ -1067,49 +852,49 @@ # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0251" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing" +dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0251.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "The variable '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The parameter '${IAMNOTEXISTING}' is not available!" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0252" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing" +dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0252.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "The variable '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The parameter '${IAMNOTEXISTING}' is not available!" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0253" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing" +dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0253.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "The variable '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The parameter '${IAMNOTEXISTING}' is not available!" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0254" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing" +dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" @@ -1123,225 +908,280 @@ # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0255" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (1)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0255.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "The parameter '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testlist}' inside the string value '${testlist}' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0256" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (2)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0256.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "The variable '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testlist}' inside the string value 'A_${testlist}_B' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0257" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (3)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0257.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "The variable '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testdict}' inside the string value '${testdict}' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0258" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (4)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0258.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "The parameter '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testdict}' inside the string value 'A_${testdict}_B' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0259" -dictUsecase['DESCRIPTION'] = "JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (5)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0259.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "The parameter '${IAMNOTEXISTING}' is not available!" +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testlist}' inside the string value 'A_${testlist}_${testdict}_B' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0260" -dictUsecase['DESCRIPTION'] = "JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1)" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (6)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0260.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "Found expression '${param}' with at least one parameter of composite data type ('${param}' is of type ). Because of this expression is the name of a parameter, only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testdict}' inside the string value '${testdict}' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0261" -dictUsecase['DESCRIPTION'] = "JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2)" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (7)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0261.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testlist}' inside the string value '${testlist}' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0262" -dictUsecase['DESCRIPTION'] = "JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1)" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (8)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0262.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "Found expression '${param}' with at least one parameter of composite data type ('${param}' is of type ). Because of this expression is the name of a parameter, only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testlist}' inside the string value '${testlist}' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0263" -dictUsecase['DESCRIPTION'] = "JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2)" +dictUsecase['DESCRIPTION'] = "JSON file with substitution of blocked data types inside string values (9)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0263.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "The substitution of parameter '${testdict}' inside the string value '${testdict}' is not supported! Composite data types like lists and dictionaries cannot be substituted inside strings." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0264" -dictUsecase['DESCRIPTION'] = "JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1)" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (1)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0264.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"${param1}\"" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0265" -dictUsecase['DESCRIPTION'] = "JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2)" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (2)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0265.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"A.${param1}.B\"" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0266" -dictUsecase['DESCRIPTION'] = "JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1)" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (3)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0266.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"${testlist}\"" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0267" -dictUsecase['DESCRIPTION'] = "JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2)" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (4)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0267.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "only simple data types are allowed to be substituted inside." +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"A.${testdict}.B\"" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0268" -dictUsecase['DESCRIPTION'] = "JSON file with dictionary parameter substitution in parameter value (composite data types not allowed in values)" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (5)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0268.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO !!! +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"${param1}\"" dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_0269" -dictUsecase['DESCRIPTION'] = "JSON file with list parameter substitution in parameter value (composite data types not allowed in names)" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (6)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0269.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO !!! +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"A.${param1}.B\"" dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- -# JPP_0270 does not really belong to PARAMETER_SUBSTITUTION, maybe move to another section dictUsecase = {} dictUsecase['TESTID'] = "JPP_0270" -dictUsecase['DESCRIPTION'] = "JSON file containing a list; list index is defined by a parameter and wrapped in single quotes" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (7)" dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" # Note: Parameter subsitution in key names is blocked (Ticket 270) +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = "List indices must be of type 'int'" +dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0270.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed" # "expects integer as index. Got string instead in" +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"${testlist}\"" +dictUsecase['EXPECTEDRETURN'] = None +listofdictUsecases.append(dictUsecase) +del dictUsecase +# -------------------------------------------------------------------------------------------------------------- +dictUsecase = {} +dictUsecase['TESTID'] = "JPP_0271" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (8)" +dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" +dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['HINT'] = None +dictUsecase['COMMENT'] = None +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0271.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = "A substitution in key names is not allowed! Please update the key name \"A.${testdict}.B\"" +dictUsecase['EXPECTEDRETURN'] = None +listofdictUsecases.append(dictUsecase) +del dictUsecase +# -------------------------------------------------------------------------------------------------------------- +dictUsecase = {} +dictUsecase['TESTID'] = "JPP_0272" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (9)" +dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" +dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['HINT'] = None +dictUsecase['COMMENT'] = None +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0272.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key '${testdict}['${param}']' that does not exist. But new keys can only be created based on hard code names." +dictUsecase['EXPECTEDRETURN'] = None +listofdictUsecases.append(dictUsecase) +del dictUsecase +# -------------------------------------------------------------------------------------------------------------- +dictUsecase = {} +dictUsecase['TESTID'] = "JPP_0273" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (10)" +dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" +dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['HINT'] = None +dictUsecase['COMMENT'] = None +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0273.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key '${testdict}[${param}]' that does not exist. But new keys can only be created based on hard code names." +dictUsecase['EXPECTEDRETURN'] = None +listofdictUsecases.append(dictUsecase) +del dictUsecase +# -------------------------------------------------------------------------------------------------------------- +dictUsecase = {} +dictUsecase['TESTID'] = "JPP_0274" +dictUsecase['DESCRIPTION'] = "JSON file with blocked dynamic key names (11)" +dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['SECTION'] = "PARAMETER_SUBSTITUTION" +dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['HINT'] = None +dictUsecase['COMMENT'] = None +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0274.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key '${testdict.${param}}' that does not exist. But new keys can only be created based on hard code names." dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2018,7 +1858,7 @@ dictUsecase['SUBSECTION'] = "GOODCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0504.jsonp" # current issue: Expecting value: line 20 column 14 (char 1088)'! +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0504.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ [DOTDICT] (20/1) > {param1} [DOTDICT] (1/1) > {A} [DOTDICT] (1/1) > {B} [DOTDICT] (1/1) > {C} [DOTDICT] (1/1) > {D} [FLOAT] : 1.23 @@ -2208,30 +2048,25 @@ dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0513.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (21/1) > {intparam} [INT] : 0 -[DOTDICT] (21/2) > {stringparam} [STR] : 'A' -[DOTDICT] (21/3) > {listparam} [LIST] (2/1) > [STR] : 'C' -[DOTDICT] (21/3) > {listparam} [LIST] (2/2) > [STR] : 'D' -[DOTDICT] (21/4) > {dictparam} [DOTDICT] (3/1) > {0} [INT] : 3 -[DOTDICT] (21/4) > {dictparam} [DOTDICT] (3/2) > {A} [INT] : 5 -[DOTDICT] (21/4) > {dictparam} [DOTDICT] (3/3) > {B} [INT] : 6 -[DOTDICT] (21/5) > {val01} [STR] : 'A' -[DOTDICT] (21/6) > {val02} [STR] : 'B' -[DOTDICT] (21/7) > {val03} [INT] : 0 -[DOTDICT] (21/8) > {val04} [INT] : 1 -[DOTDICT] (21/9) > {val05} [INT] : 1 -[DOTDICT] (21/10) > {val06} [INT] : 1 -[DOTDICT] (21/11) > {val07} [STR] : 'A' -[DOTDICT] (21/12) > {val08} [STR] : 'B' -[DOTDICT] (21/13) > {val09} [STR] : '0' -[DOTDICT] (21/14) > {val10} [STR] : '1' -[DOTDICT] (21/15) > {val11} [STR] : '1' -[DOTDICT] (21/16) > {val12} [STR] : '1' -[DOTDICT] (21/17) > {C} [STR] : 'E' -[DOTDICT] (21/18) > {D} [STR] : 'F' -[DOTDICT] (21/19) > {3} [INT] : 3 -[DOTDICT] (21/20) > {5} [INT] : 5 -[DOTDICT] (21/21) > {6} [INT] : 6""" +[DOTDICT] (16/1) > {intparam} [INT] : 0 +[DOTDICT] (16/2) > {stringparam} [STR] : 'A' +[DOTDICT] (16/3) > {listparam} [LIST] (2/1) > [STR] : 'C' +[DOTDICT] (16/3) > {listparam} [LIST] (2/2) > [STR] : 'D' +[DOTDICT] (16/4) > {dictparam} [DOTDICT] (3/1) > {0} [INT] : 3 +[DOTDICT] (16/4) > {dictparam} [DOTDICT] (3/2) > {A} [INT] : 5 +[DOTDICT] (16/4) > {dictparam} [DOTDICT] (3/3) > {B} [INT] : 6 +[DOTDICT] (16/5) > {val01} [STR] : 'A' +[DOTDICT] (16/6) > {val02} [STR] : 'B' +[DOTDICT] (16/7) > {val03} [INT] : 0 +[DOTDICT] (16/8) > {val04} [INT] : 1 +[DOTDICT] (16/9) > {val05} [INT] : 1 +[DOTDICT] (16/10) > {val06} [INT] : 1 +[DOTDICT] (16/11) > {val07} [STR] : 'A' +[DOTDICT] (16/12) > {val08} [STR] : 'B' +[DOTDICT] (16/13) > {val09} [STR] : '0' +[DOTDICT] (16/14) > {val10} [STR] : '1' +[DOTDICT] (16/15) > {val11} [STR] : '1' +[DOTDICT] (16/16) > {val12} [STR] : '1'""" listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- @@ -2611,10 +2446,10 @@ dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1004.jsonp" dictUsecase['EXPECTEDEXCEPTION'] = None dictUsecase['EXPECTEDRETURN'] = """ -[DOTDICT] (4/1) > {testdict4} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 20 -[DOTDICT] (4/2) > {testdict1} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 4 -[DOTDICT] (4/3) > {testdict2} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 9 -[DOTDICT] (4/4) > {testdict3} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 10 +[DOTDICT] (4/1) > {testdict3} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 30 +[DOTDICT] (4/2) > {testdict4} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 40 +[DOTDICT] (4/3) > {testdict1} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 4 +[DOTDICT] (4/4) > {testdict2} [DOTDICT] (1/1) > {subKey1} [DOTDICT] (1/1) > {subKey2} [DOTDICT] (1/1) > {subKey3} [DOTDICT] (1/1) > {subKey4} [INT] : 8 """ listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2629,7 +2464,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1050.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" # Update based on new requirement about dynamic key names 270 +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2643,7 +2478,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1051.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" # Update based on new requirement about dynamic key names 270 +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2657,7 +2492,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1052.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" # Update based on new requirement about dynamic key names 270 +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2713,7 +2548,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1056.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" # Update based on new requirement about dynamic key names 270 +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2727,7 +2562,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1057.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" # Update based on new requirement about dynamic key names 270 +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase @@ -2741,7 +2576,7 @@ dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1058.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" # Update based on new requirement about dynamic key names 270 +dictUsecase['EXPECTEDEXCEPTION'] = "Identified dynamic name of key" dictUsecase['EXPECTEDRETURN'] = None listofdictUsecases.append(dictUsecase) del dictUsecase diff --git a/test/testfiles/jpp-test_config_0201.jsonp b/test/testfiles/jpp-test_config_0201.jsonp index f0ffe227..ef0a744e 100644 --- a/test/testfiles/jpp-test_config_0201.jsonp +++ b/test/testfiles/jpp-test_config_0201.jsonp @@ -15,7 +15,6 @@ { // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", - // Updated the key name due to enhancement 270 - Dynamic key names shall be blocked - // "${m${il${innermost_milestone_name}o}ne}_${milestone_number}" : "MILESTONE_2 (new value)" - ${milestone_2} : "MILESTONE_2 (new value)" + // + "param" : "VAR_${variant_${list_variant_numbers}[${list_variant_index}]}_MS_${milestone_${list_milestone_numbers}[${list_milestone_index}]} value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0202.jsonp b/test/testfiles/jpp-test_config_0202.jsonp index 0c4f59b1..1d12ca21 100644 --- a/test/testfiles/jpp-test_config_0202.jsonp +++ b/test/testfiles/jpp-test_config_0202.jsonp @@ -15,7 +15,6 @@ { // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", - // Updated key name due to enhancement 270 - Dynamic key names shall be blocked - // "VAR_${variant_${list_variant_numbers}[${list_variant_index}]}_MS_${milestone_${list_milestone_numbers}[${list_milestone_index}]}_param" : "value" - ${VAR_VARIANT_1_MS_MILESTONE_2_param} : "value" + // + "param" : "VAR_${variant_${list_variant_numbers.${list_variant_index}}}_MS_${milestone_${list_milestone_numbers.${list_milestone_index}}} value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0203.jsonp b/test/testfiles/jpp-test_config_0203.jsonp index ae53c12a..fad626a3 100644 --- a/test/testfiles/jpp-test_config_0203.jsonp +++ b/test/testfiles/jpp-test_config_0203.jsonp @@ -15,7 +15,6 @@ { // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", - // Updated key name due to enhancement 270 - Dynamic key names shall be blocked - // "VAR_${variant_${list_variant_numbers.${list_variant_index}}}_MS_${milestone_${list_milestone_numbers.${list_milestone_index}}}_param" : "value" - ${VAR_VARIANT_1_MS_MILESTONE_2_param} : "value" + // + "param" : "VAR_${dict_variants}['${variant_key_${variant_number}}']_MS_${dict_milestones}['${milestone_key_${milestone_number}}'] value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0204.jsonp b/test/testfiles/jpp-test_config_0204.jsonp index ef0a744e..a3a4517e 100644 --- a/test/testfiles/jpp-test_config_0204.jsonp +++ b/test/testfiles/jpp-test_config_0204.jsonp @@ -16,5 +16,5 @@ // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", // - "param" : "VAR_${variant_${list_variant_numbers}[${list_variant_index}]}_MS_${milestone_${list_milestone_numbers}[${list_milestone_index}]} value" + "param" : "VAR_${dict_variants.${variant_key_${variant_number}}}_MS_${dict_milestones.${milestone_key_${milestone_number}}} value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0206.jsonp b/test/testfiles/jpp-test_config_0206.jsonp deleted file mode 100644 index 587d9429..00000000 --- a/test/testfiles/jpp-test_config_0206.jsonp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2020-2024 Robert Bosch GmbH -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -//************************************************************************** -{ - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // Updated key name due to enhancement 270 - Dynamic key names shall be blocked - // "VAR_${dict_variants}['${variant_key_${variant_number}}']_MS_${dict_milestones}['${milestone_key_${milestone_number}}']_param" : "value" - ${VAR_VARIANT_1_MS_MILESTONE_2_param} : "value" -} \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0251.jsonp b/test/testfiles/jpp-test_config_0251.jsonp index 8dc0978b..3f119409 100644 --- a/test/testfiles/jpp-test_config_0251.jsonp +++ b/test/testfiles/jpp-test_config_0251.jsonp @@ -16,5 +16,5 @@ // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", // - "${m${IAMNOTEXISTING}ne}_${milestone_number}" : "MILESTONE_2 (new value)" + "param" : "VAR_${variant_${list_variant_numbers}[${IAMNOTEXISTING}]}_MS_${milestone_${list_milestone_numbers}[${list_milestone_index}]} value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0252.jsonp b/test/testfiles/jpp-test_config_0252.jsonp index 326d2dd5..76e9a991 100644 --- a/test/testfiles/jpp-test_config_0252.jsonp +++ b/test/testfiles/jpp-test_config_0252.jsonp @@ -16,5 +16,5 @@ // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", // - "VAR_${variant_${list_variant_numbers}[${IAMNOTEXISTING}]}_MS_${milestone_${list_milestone_numbers}[${list_milestone_index}]}_param" : "value" + "param" : "VAR_${variant_${list_variant_numbers.${list_variant_index}}}_MS_${milestone_${list_milestone_numbers.${IAMNOTEXISTING}}} value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0253.jsonp b/test/testfiles/jpp-test_config_0253.jsonp index e89db170..2f4576dd 100644 --- a/test/testfiles/jpp-test_config_0253.jsonp +++ b/test/testfiles/jpp-test_config_0253.jsonp @@ -16,5 +16,5 @@ // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", // - "VAR_${variant_${list_variant_numbers.${list_variant_index}}}_MS_${milestone_${list_milestone_numbers.${IAMNOTEXISTING}}}_param" : "value" + "param" : "VAR_${dict_variants}['${variant_key_${IAMNOTEXISTING}}']_MS_${dict_milestones}['${milestone_key_${milestone_number}}'] value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0254.jsonp b/test/testfiles/jpp-test_config_0254.jsonp index 3f119409..3c45a763 100644 --- a/test/testfiles/jpp-test_config_0254.jsonp +++ b/test/testfiles/jpp-test_config_0254.jsonp @@ -16,5 +16,5 @@ // taking over the already defined basic data types "[import]" : "./jpp-test_config_testdata_1.jsonp", // - "param" : "VAR_${variant_${list_variant_numbers}[${IAMNOTEXISTING}]}_MS_${milestone_${list_milestone_numbers}[${list_milestone_index}]} value" + "param" : "VAR_${dict_variants.${variant_key_${variant_number}}}_MS-${dict_milestones.${milestone_key_${IAMNOTEXISTING}}} value" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0255.jsonp b/test/testfiles/jpp-test_config_0255.jsonp index 76e9a991..9c6b72b0 100644 --- a/test/testfiles/jpp-test_config_0255.jsonp +++ b/test/testfiles/jpp-test_config_0255.jsonp @@ -13,8 +13,6 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "param" : "VAR_${variant_${list_variant_numbers.${list_variant_index}}}_MS_${milestone_${list_milestone_numbers.${IAMNOTEXISTING}}} value" + "testlist" : [1,2,3], + "param" : "${testlist}" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0256.jsonp b/test/testfiles/jpp-test_config_0256.jsonp index 092f4c25..38108fa0 100644 --- a/test/testfiles/jpp-test_config_0256.jsonp +++ b/test/testfiles/jpp-test_config_0256.jsonp @@ -13,8 +13,6 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "VAR_${dict_variants}['${variant_key_${IAMNOTEXISTING}}']_MS_${dict_milestones}['${milestone_key_${milestone_number}}']_param" : "value" + "testlist" : [1,2,3], + "param" : "A_${testlist}_B" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0257.jsonp b/test/testfiles/jpp-test_config_0257.jsonp index 3bad97b6..b165a937 100644 --- a/test/testfiles/jpp-test_config_0257.jsonp +++ b/test/testfiles/jpp-test_config_0257.jsonp @@ -13,8 +13,6 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "VAR_${dict_variants.${variant_key_${variant_number}}}_MS_${dict_milestones.${milestone_key_${IAMNOTEXISTING}}}_param" : "value" + "testdict" : {"A" : 1, "B" : 2}, + "param" : "${testdict}" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0258.jsonp b/test/testfiles/jpp-test_config_0258.jsonp index 2f4576dd..d2d7bd26 100644 --- a/test/testfiles/jpp-test_config_0258.jsonp +++ b/test/testfiles/jpp-test_config_0258.jsonp @@ -13,8 +13,6 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "param" : "VAR_${dict_variants}['${variant_key_${IAMNOTEXISTING}}']_MS_${dict_milestones}['${milestone_key_${milestone_number}}'] value" + "testdict" : {"A" : 1, "B" : 2}, + "param" : "A_${testdict}_B" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0259.jsonp b/test/testfiles/jpp-test_config_0259.jsonp index 3c45a763..68ad6cdc 100644 --- a/test/testfiles/jpp-test_config_0259.jsonp +++ b/test/testfiles/jpp-test_config_0259.jsonp @@ -13,8 +13,7 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "param" : "VAR_${dict_variants.${variant_key_${variant_number}}}_MS-${dict_milestones.${milestone_key_${IAMNOTEXISTING}}} value" + "testlist" : [1,2,3], + "testdict" : {"A" : 1, "B" : 2}, + "param" : "A_${testlist}_${testdict}_B" } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0260.jsonp b/test/testfiles/jpp-test_config_0260.jsonp index e1df216e..f0247392 100644 --- a/test/testfiles/jpp-test_config_0260.jsonp +++ b/test/testfiles/jpp-test_config_0260.jsonp @@ -13,6 +13,6 @@ // limitations under the License. //************************************************************************** { - "param" : [1,2,3], - "${param}" : "value" + "testdict" : {"A" : 1, "B" : 2}, + "param" : [1,"${testdict}",3] } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0261.jsonp b/test/testfiles/jpp-test_config_0261.jsonp index 14193100..00838b71 100644 --- a/test/testfiles/jpp-test_config_0261.jsonp +++ b/test/testfiles/jpp-test_config_0261.jsonp @@ -13,7 +13,6 @@ // limitations under the License. //************************************************************************** { - "param1" : "prefix", - "param2" : [1,2,3], - "${param1}_${param2}_suffix" : "value" + "testlist" : [1,2,3], + "param" : {"A" : 1, "B" : "${testlist}"} } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0262.jsonp b/test/testfiles/jpp-test_config_0262.jsonp index fc66d21b..e07690d1 100644 --- a/test/testfiles/jpp-test_config_0262.jsonp +++ b/test/testfiles/jpp-test_config_0262.jsonp @@ -13,6 +13,6 @@ // limitations under the License. //************************************************************************** { - "param" : {"A" : 1, "B" : 2}, - "${param}" : "value" + "testlist" : [1,2,3], + "param" : {"A" : [{"A" : 1, "B" : 2}, {"C" : 3, "D" : [1,2,"${testlist}",3]}], "E" : 5} } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0263.jsonp b/test/testfiles/jpp-test_config_0263.jsonp index 9c4e52c1..c5baba26 100644 --- a/test/testfiles/jpp-test_config_0263.jsonp +++ b/test/testfiles/jpp-test_config_0263.jsonp @@ -13,7 +13,6 @@ // limitations under the License. //************************************************************************** { - "param1" : "prefix", - "param2" : {"A" : 1, "B" : 2}, - "${param1}_${param2}_suffix" : "value" + "testdict" : {"A" : 1, "B" : 2}, + "param" : {"A" : [{"A" : 1, "B" : 2}, {"C" : 3, "D" : [1,2,"${testdict}",3]}], "E" : 5} } \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_0264.jsonp b/test/testfiles/jpp-test_config_0264.jsonp index 54c2fd73..57ec108b 100644 --- a/test/testfiles/jpp-test_config_0264.jsonp +++ b/test/testfiles/jpp-test_config_0264.jsonp @@ -13,6 +13,6 @@ // limitations under the License. //************************************************************************** { - "param1" : [1,2,3], - "param2" : {"${param1}" : "value"} -} \ No newline at end of file + "param1" : "A", + "${param1}" : "B" +} diff --git a/test/testfiles/jpp-test_config_0265.jsonp b/test/testfiles/jpp-test_config_0265.jsonp index edb0591a..efe4e797 100644 --- a/test/testfiles/jpp-test_config_0265.jsonp +++ b/test/testfiles/jpp-test_config_0265.jsonp @@ -13,7 +13,6 @@ // limitations under the License. //************************************************************************** { - "param1" : "prefix", - "param2" : [1,2,3], - "param3" : {"${param1}_${param2}_suffix" : "value"} -} \ No newline at end of file + "param1" : "A", + "A.${param1}.B" : "B" +} diff --git a/test/testfiles/jpp-test_config_0266.jsonp b/test/testfiles/jpp-test_config_0266.jsonp index 19760b6a..c355976a 100644 --- a/test/testfiles/jpp-test_config_0266.jsonp +++ b/test/testfiles/jpp-test_config_0266.jsonp @@ -13,6 +13,6 @@ // limitations under the License. //************************************************************************** { - "param1" : {"A" : 1, "B" : 2}, - "param2" : {"${param1}" : "value"} + "testlist" : [1,2,3], + "${testlist}" : "B" } diff --git a/test/testfiles/jpp-test_config_0267.jsonp b/test/testfiles/jpp-test_config_0267.jsonp index cfbb7ab2..1aed227c 100644 --- a/test/testfiles/jpp-test_config_0267.jsonp +++ b/test/testfiles/jpp-test_config_0267.jsonp @@ -13,7 +13,6 @@ // limitations under the License. //************************************************************************** { - "param1" : "prefix", - "param2" : {"A" : 1, "B" : 2}, - "param3" : {"${param1}_${param2}_suffix" : "value"} -} \ No newline at end of file + "testdict" : {"A" : 1, "B" : 2}, + "A.${testdict}.B" : "B" +} diff --git a/test/testfiles/jpp-test_config_0268.jsonp b/test/testfiles/jpp-test_config_0268.jsonp index 491efaee..4d53e2ff 100644 --- a/test/testfiles/jpp-test_config_0268.jsonp +++ b/test/testfiles/jpp-test_config_0268.jsonp @@ -13,6 +13,6 @@ // limitations under the License. //************************************************************************** { - "dictParam" : {"A" : 0, "B" : 1}, - "param" : "${dictParam}" -} \ No newline at end of file + "param1" : "A", + "param1" : {"A" : 1, "${param1}" : 2} +} diff --git a/test/testfiles/jpp-test_config_0269.jsonp b/test/testfiles/jpp-test_config_0269.jsonp index 66b8f2bc..d3ae4e97 100644 --- a/test/testfiles/jpp-test_config_0269.jsonp +++ b/test/testfiles/jpp-test_config_0269.jsonp @@ -13,6 +13,6 @@ // limitations under the License. //************************************************************************** { - "listParam" : ["A", "B"], - "param" : "${listParam}" -} \ No newline at end of file + "param1" : "A", + "param1" : {"A" : 1, "A.${param1}.B" : 2} +} diff --git a/test/testfiles/jpp-test_config_0270.jsonp b/test/testfiles/jpp-test_config_0270.jsonp index 25d3ec64..aee13e6f 100644 --- a/test/testfiles/jpp-test_config_0270.jsonp +++ b/test/testfiles/jpp-test_config_0270.jsonp @@ -13,7 +13,6 @@ // limitations under the License. //************************************************************************** { - "intval" : 1, - "listval" : ["B", 2], - "param_${listval}['${intval}']}" : 3 -} \ No newline at end of file + "testlist" : [1,2,3], + "param1" : {"A" : 1, "${testlist}" : 2} +} diff --git a/test/testfiles/jpp-test_config_0209.jsonp b/test/testfiles/jpp-test_config_0271.jsonp similarity index 73% rename from test/testfiles/jpp-test_config_0209.jsonp rename to test/testfiles/jpp-test_config_0271.jsonp index a3a4517e..fe7da8ed 100644 --- a/test/testfiles/jpp-test_config_0209.jsonp +++ b/test/testfiles/jpp-test_config_0271.jsonp @@ -13,8 +13,6 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "param" : "VAR_${dict_variants.${variant_key_${variant_number}}}_MS_${dict_milestones.${milestone_key_${milestone_number}}} value" -} \ No newline at end of file + "testdict" : {"A" : 1, "B" : 2}, + "param1" : {"A" : 1, "A.${testdict}.B" : 2} +} diff --git a/test/testfiles/jpp-test_config_0208.jsonp b/test/testfiles/jpp-test_config_0272.jsonp similarity index 72% rename from test/testfiles/jpp-test_config_0208.jsonp rename to test/testfiles/jpp-test_config_0272.jsonp index fad626a3..67a9146a 100644 --- a/test/testfiles/jpp-test_config_0208.jsonp +++ b/test/testfiles/jpp-test_config_0272.jsonp @@ -13,8 +13,7 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "param" : "VAR_${dict_variants}['${variant_key_${variant_number}}']_MS_${dict_milestones}['${milestone_key_${milestone_number}}'] value" -} \ No newline at end of file + "param" : "X", + "testdict" : {"A" : 1, "B" : 2}, + ${testdict}['${param}'] : 3 +} diff --git a/test/testfiles/jpp-test_config_0205.jsonp b/test/testfiles/jpp-test_config_0273.jsonp similarity index 72% rename from test/testfiles/jpp-test_config_0205.jsonp rename to test/testfiles/jpp-test_config_0273.jsonp index 1d12ca21..332a2a5f 100644 --- a/test/testfiles/jpp-test_config_0205.jsonp +++ b/test/testfiles/jpp-test_config_0273.jsonp @@ -13,8 +13,7 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // - "param" : "VAR_${variant_${list_variant_numbers.${list_variant_index}}}_MS_${milestone_${list_milestone_numbers.${list_milestone_index}}} value" -} \ No newline at end of file + "param" : "X", + "testdict" : {"A" : 1, "B" : 2}, + ${testdict}[${param}] : 3 +} diff --git a/test/testfiles/jpp-test_config_0207.jsonp b/test/testfiles/jpp-test_config_0274.jsonp similarity index 64% rename from test/testfiles/jpp-test_config_0207.jsonp rename to test/testfiles/jpp-test_config_0274.jsonp index 35241d8c..e283802b 100644 --- a/test/testfiles/jpp-test_config_0207.jsonp +++ b/test/testfiles/jpp-test_config_0274.jsonp @@ -13,9 +13,7 @@ // limitations under the License. //************************************************************************** { - // taking over the already defined basic data types - "[import]" : "./jpp-test_config_testdata_1.jsonp", - // Updated key name due to enhancement 270 - Dynamic key names shall be blocked - // "VAR_${dict_variants.${variant_key_${variant_number}}}_MS_${dict_milestones.${milestone_key_${milestone_number}}}_param" : "value" - ${VAR_VARIANT_1_MS_MILESTONE_2_param} : "value" -} \ No newline at end of file + "param" : "X", + "testdict" : {"A" : 1, "B" : 2}, + ${testdict.${param}} : 3 +} diff --git a/test/testfiles/jpp-test_config_0506.jsonp b/test/testfiles/jpp-test_config_0506.jsonp index b47e536e..d2586c8f 100644 --- a/test/testfiles/jpp-test_config_0506.jsonp +++ b/test/testfiles/jpp-test_config_0506.jsonp @@ -13,8 +13,8 @@ // limitations under the License. //************************************************************************** { - "param1" : "{\"A\" : 1, \"B\" : 2}", // updated based on enhancement 249 - Parameter substitution needs to be limited - "param2" : "[1,2,3]", // updated based on enhancement 249 - Parameter substitution needs to be limited + "param1" : "{\"A\" : 1, \"B\" : 2}", + "param2" : "[1,2,3]", "param3" : "value", // "var1" : "value 1 > ${param1}", diff --git a/test/testfiles/jpp-test_config_0513.jsonp b/test/testfiles/jpp-test_config_0513.jsonp index 7dceca93..68784302 100644 --- a/test/testfiles/jpp-test_config_0513.jsonp +++ b/test/testfiles/jpp-test_config_0513.jsonp @@ -39,19 +39,6 @@ ${dictparam}['${intparam}'] : 3, ${dictparam}[${stringparam}] : 4, ${dictparam}['${stringparam}'] : 5, - ${dictparam}['B'] : 6, - // Updated key name due to enhancement 270 - Dynamic key names shall be blocked - // "${listparam}[${intparam}]" : "E", - // "${listparam}[1]" : "F", - // "${dictparam}['${intparam}']" : 3, - // "${dictparam}[${stringparam}]" : 4, - // "${dictparam}['${stringparam}']" : 5, - // "${dictparam}['B']" : 6 - "C" : "E", - "D" : "F", - "3" : 3, - "5" : 4, - "5" : 5, - "6" : 6 + ${dictparam}['B'] : 6 } diff --git a/test/testfiles/jpp-test_config_1004.jsonp b/test/testfiles/jpp-test_config_1004.jsonp index 78b2fbff..de95407f 100644 --- a/test/testfiles/jpp-test_config_1004.jsonp +++ b/test/testfiles/jpp-test_config_1004.jsonp @@ -15,20 +15,18 @@ { // implicit creation in ascending dotdict syntax: - ${testdict1} : {"subKey1" : {"subKey2" : {"subKey3" : {"subKey4" : 0}}}}, ${testdict1.subKey1} : {"subKey2" : {"subKey3" : {"subKey4" : 1}}}, ${testdict1.subKey1.subKey2} : {"subKey3" : {"subKey4" : 2}}, ${testdict1.subKey1.subKey2.subKey3} : {"subKey4" : 3}, ${testdict1.subKey1.subKey2.subKey3.subKey4} : 4, // - // values overwritten in descending dotdict syntax: + // implicit creation in descending dotdict syntax: ${testdict2.subKey1.subKey2.subKey3.subKey4} : 5, ${testdict2.subKey1.subKey2.subKey3} : {"subKey4" : 6}, ${testdict2.subKey1.subKey2} : {"subKey3" : {"subKey4" : 7}}, ${testdict2.subKey1} : {"subKey2" : {"subKey3" : {"subKey4" : 8}}}, - ${testdict2} : {"subKey1" : {"subKey2" : {"subKey3" : {"subKey4" : 9}}}}, // // cross check: - ${testdict3} : {"subKey1" : {"subKey2" : {"subKey3" : {"subKey4" : 10}}}}, - "testdict4" : {"subKey1" : {"subKey2" : {"subKey3" : {"subKey4" : 20}}}} + "testdict3" : {"subKey1" : {"subKey2" : {"subKey3" : {"subKey4" : 30}}}}, + "testdict4" : {"subKey1" : {"subKey2" : {"subKey3" : {"subKey4" : 40}}}} }