diff --git a/test/JPP_TestUsecases.csv b/test/JPP_TestUsecases.csv index f70ca888..52d6dca9 100644 --- a/test/JPP_TestUsecases.csv +++ b/test/JPP_TestUsecases.csv @@ -66,6 +66,7 @@ JPP_0368|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' an JPP_0369|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' and ending with '}', further matching '${' and '}' in between (not all nested) (invalid syntax 3) JPP_0370|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' and ending with '}', further matching '${' and '}' in between (not all nested) (invalid syntax 4) JPP_0371|VALUE_DETECTION|BADCASE|JSON file with expression starting with '${' and ending with '}', further matching '${' and '}' in between (not all nested) (invalid syntax 5) +JPP_0400|NAMING_CONVENTION|GOODCASE|JSON file with several parameter names w.r.t. the naming convention JPP_0500|COMPOSITE_EXPRESSIONS|GOODCASE|JSON file with composite data structure (nested lists and dictionaries 1) JPP_0501|COMPOSITE_EXPRESSIONS|GOODCASE|JSON file with composite data structure (nested lists and dictionaries 2) JPP_0502|COMPOSITE_EXPRESSIONS|GOODCASE|JSON file with composite data structure (nested lists and dictionaries 3 / some key names with dots inside) diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html index fa993c07..90c0d544 100644 --- a/test/JPP_TestUsecases.html +++ b/test/JPP_TestUsecases.html @@ -2239,6 +2239,39 @@ 67 + + + +JPP_0400 + + + + +NAMING_CONVENTION + + + + +GOODCASE + + + + +JSON file with several parameter names w.r.t. the naming convention
+Expected: All names are accepted (in definition and in reference) + + + + + + + + + + +68 + + @@ -2270,7 +2303,7 @@ -68 +69 @@ -2304,7 +2337,7 @@ -69 +70 @@ -2338,7 +2371,7 @@ -70 +71 @@ -2371,7 +2404,7 @@ -71 +72 @@ -2404,7 +2437,7 @@ -72 +73 @@ -2437,7 +2470,7 @@ -73 +74 @@ -2470,7 +2503,7 @@ -74 +75 @@ -2503,7 +2536,7 @@ -75 +76 @@ -2536,7 +2569,7 @@ -76 +77 @@ -2569,7 +2602,7 @@ -77 +78 @@ -2602,7 +2635,7 @@ -78 +79 @@ -2635,7 +2668,7 @@ -79 +80 @@ -2668,7 +2701,7 @@ -80 +81 @@ -2701,7 +2734,7 @@ -81 +82 @@ -2734,7 +2767,7 @@ -82 +83 @@ -2767,7 +2800,7 @@ -83 +84 @@ -2800,7 +2833,7 @@ -84 +85 @@ -2834,7 +2867,7 @@ -85 +86 @@ -2868,7 +2901,7 @@ -86 +87 @@ -2901,7 +2934,7 @@ -87 +88 @@ -2934,7 +2967,7 @@ -88 +89 @@ -2967,7 +3000,7 @@ -89 +90 @@ -3000,7 +3033,7 @@ -90 +91 @@ -3033,7 +3066,7 @@ -91 +92 @@ -3066,7 +3099,7 @@ -92 +93 @@ -3099,7 +3132,7 @@ -93 +94 @@ -3132,7 +3165,7 @@ -94 +95 @@ -3165,7 +3198,7 @@ -95 +96 @@ -3198,7 +3231,7 @@ -96 +97 @@ -3231,7 +3264,7 @@ -97 +98 @@ -3264,7 +3297,7 @@ -98 +99 @@ -3297,7 +3330,7 @@ -99 +100 @@ -3330,7 +3363,7 @@ -100 +101 @@ -3363,7 +3396,7 @@ -101 +102 @@ -3396,7 +3429,7 @@ -102 +103 @@ -3429,7 +3462,7 @@ -103 +104 @@ -3462,7 +3495,7 @@ -104 +105 @@ -3495,7 +3528,7 @@ -105 +106 @@ -3528,7 +3561,7 @@ -106 +107 @@ -3561,7 +3594,7 @@ -107 +108 @@ -3594,7 +3627,7 @@ -108 +109 @@ -3627,7 +3660,7 @@ -109 +110 @@ -3660,7 +3693,7 @@ -110 +111 @@ -3693,7 +3726,7 @@ -111 +112 @@ -3726,7 +3759,7 @@ -112 +113 @@ -3760,7 +3793,7 @@ -113 +114 @@ -3793,7 +3826,7 @@ -114 +115 @@ -3826,7 +3859,7 @@ -115 +116 @@ -3859,7 +3892,7 @@ -116 +117 @@ -3892,7 +3925,7 @@ -117 +118 @@ -3925,7 +3958,7 @@ -118 +119 @@ -3958,7 +3991,7 @@ -119 +120 @@ -3991,7 +4024,7 @@ -120 +121 @@ -4024,7 +4057,7 @@ -121 +122 @@ -4057,7 +4090,7 @@ -122 +123 @@ -4090,7 +4123,7 @@ -123 +124 @@ -4123,7 +4156,7 @@ -124 +125 @@ -4156,7 +4189,7 @@ -125 +126 @@ -4189,7 +4222,7 @@ -126 +127 @@ -4222,7 +4255,7 @@ -127 +128 @@ -4255,7 +4288,7 @@ -128 +129 @@ -4288,7 +4321,7 @@ -129 +130 @@ -4321,7 +4354,7 @@ -130 +131 @@ -4354,7 +4387,7 @@ -131 +132 @@ -4387,7 +4420,7 @@ -132 +133 @@ -4420,7 +4453,7 @@ -133 +134 @@ -4453,7 +4486,7 @@ -134 +135 @@ -4486,7 +4519,7 @@ -135 +136 @@ -4519,7 +4552,7 @@ -136 +137 @@ -4552,7 +4585,7 @@ -137 +138 @@ -4585,7 +4618,7 @@ -138 +139 @@ -4618,7 +4651,7 @@ -139 +140 @@ -4651,7 +4684,7 @@ -140 +141 @@ -4684,7 +4717,7 @@ -141 +142 @@ -4717,7 +4750,7 @@ -142 +143 @@ -4750,7 +4783,7 @@ -143 +144 @@ -4783,7 +4816,7 @@ -144 +145 @@ -4816,7 +4849,7 @@ -145 +146 @@ -4849,7 +4882,7 @@ -146 +147 @@ -4882,7 +4915,7 @@ -147 +148 @@ -4915,7 +4948,7 @@ -148 +149 @@ -4948,7 +4981,7 @@ -149 +150 @@ -4981,7 +5014,7 @@ -150 +151 @@ -5014,7 +5047,7 @@ -151 +152 @@ -5047,7 +5080,7 @@ -152 +153 @@ -5080,7 +5113,7 @@ -153 +154 @@ -5113,7 +5146,7 @@ -154 +155 @@ -5146,7 +5179,7 @@ -155 +156 @@ -5179,7 +5212,7 @@ -156 +157 @@ -5212,7 +5245,7 @@ -157 +158 @@ -5245,7 +5278,7 @@ -158 +159 @@ -5278,7 +5311,7 @@ -159 +160 @@ -5311,7 +5344,7 @@ -160 +161 @@ -5344,7 +5377,7 @@ -161 +162 @@ -5377,7 +5410,7 @@ -162 +163 @@ -5410,7 +5443,7 @@ -163 +164 @@ -5443,7 +5476,7 @@
 
-
Generated: 23.10.2024 - 19:41:03
+
Generated: 25.10.2024 - 20:21:51
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst index 34b81feb..9d46a977 100644 --- a/test/JPP_TestUsecases.rst +++ b/test/JPP_TestUsecases.rst @@ -729,6 +729,16 @@ Test Use Cases ---- +* **Test JPP_0400** + + [NAMING_CONVENTION / GOODCASE] + + **JSON file with several parameter names w.r.t. the naming convention** + + Expected: All names are accepted (in definition and in reference) + +---- + * **Test JPP_0500** [COMPOSITE_EXPRESSIONS / GOODCASE] @@ -1711,5 +1721,5 @@ Test Use Cases ---- -Generated: 23.10.2024 - 19:41:03 +Generated: 25.10.2024 - 20:21:51 diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt index fd456a60..2b0cf434 100644 --- a/test/JPP_TestUsecases.txt +++ b/test/JPP_TestUsecases.txt @@ -306,6 +306,10 @@ Description: JSON file with expression starting with '${' and ending with '}', f Expectation: No values are returned, and JsonPreprocessor throws an exception Hint.......: Checklist rule 6 / pattern 5 ------------------------------------------------------------------------------------------------------------------------ +Test JPP_0400 / NAMING_CONVENTION / GOODCASE +Description: JSON file with several parameter names w.r.t. the naming convention +Expectation: All names are accepted (in definition and in reference) +------------------------------------------------------------------------------------------------------------------------ Test JPP_0500 / COMPOSITE_EXPRESSIONS / GOODCASE Description: JSON file with composite data structure (nested lists and dictionaries 1) Expectation: JsonPreprocessor returns expected value @@ -700,5 +704,5 @@ Test JPP_2508 / PARAMETER_SCOPE / BADCASE Description: JSON file containing a parameter with missing scope (9) Expectation: JsonPreprocessor returns expected value ------------------------------------------------------------------------------------------------------------------------ -Generated: 23.10.2024 - 19:41:03 +Generated: 25.10.2024 - 20:21:51 diff --git a/test/component_test.py b/test/component_test.py index 51eeb3ea..c110ed1f 100644 --- a/test/component_test.py +++ b/test/component_test.py @@ -22,8 +22,8 @@ # # -------------------------------------------------------------------------------------------------------------- # -VERSION = "0.47.0" -VERSION_DATE = "23.10.2024" +VERSION = "0.48.1" +VERSION_DATE = "25.10.2024" # # -------------------------------------------------------------------------------------------------------------- #TM*** diff --git a/test/libs/CCodePatterns.py b/test/libs/CCodePatterns.py index 1bdef07a..e527d9ea 100644 --- a/test/libs/CCodePatterns.py +++ b/test/libs/CCodePatterns.py @@ -81,7 +81,7 @@ def GetPyTestFileHeader(self, PYTESTFILENAME="", CLASSNAME=""): # # ####PYTESTFILENAME#### # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # # ####DATEOFCREATION#### # diff --git a/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py b/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py index e83f6412..b6efa5e3 100644 --- a/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py +++ b/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py @@ -16,9 +16,9 @@ # # test_01_DATA_TYPES_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 14.03.2024 - 15:46:24 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py b/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py index be06d44e..8efb6792 100644 --- a/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py +++ b/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py @@ -16,9 +16,9 @@ # # test_02_DATA_INTEGRITY_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 15.03.2024 - 18:49:01 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py b/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py index 9bfde838..c71a7dcd 100644 --- a/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py @@ -16,9 +16,9 @@ # # test_03_PARAMETER_SUBSTITUTION_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 22.10.2024 - 16:30:20 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py b/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py index edf79285..b71553cb 100644 --- a/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py +++ b/test/pytest/pytestfiles/test_04_PARAMETER_SUBSTITUTION_BADCASE.py @@ -16,9 +16,9 @@ # # test_04_PARAMETER_SUBSTITUTION_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 22.10.2024 - 16:30:20 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py b/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py index 12c81122..8cc52f05 100644 --- a/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py @@ -16,9 +16,9 @@ # # test_05_VALUE_DETECTION_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 24.01.2024 - 13:56:16 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py b/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py index 216473b4..a901df27 100644 --- a/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py +++ b/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py @@ -16,9 +16,9 @@ # # test_06_VALUE_DETECTION_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 20.11.2023 - 15:42:16 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py b/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py new file mode 100644 index 00000000..d8fac789 --- /dev/null +++ b/test/pytest/pytestfiles/test_07_NAMING_CONVENTION_GOODCASE.py @@ -0,0 +1,40 @@ +# ************************************************************************************************************** +# Copyright 2020-2023 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. +# -------------------------------------------------------------------------------------------------------------- +# +# test_07_NAMING_CONVENTION_GOODCASE.py +# +# XC-HWP/ESW3-Queckenstedt +# +# 25.10.2024 - 20:31:28 +# +# -------------------------------------------------------------------------------------------------------------- + +import pytest +from pytestlibs.CExecute import CExecute + +# -------------------------------------------------------------------------------------------------------------- + +class Test_NAMING_CONVENTION_GOODCASE: + +# -------------------------------------------------------------------------------------------------------------- + # Expected: All names are accepted (in definition and in reference) + @pytest.mark.parametrize( + "Description", ["JSON file with several parameter names w.r.t. the naming convention",] + ) + def test_JPP_0400(self, Description): + nReturn = CExecute.Execute("JPP_0400") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py b/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_GOODCASE.py similarity index 98% rename from test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py rename to test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_GOODCASE.py index f47a71c3..7940b512 100644 --- a/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py +# test_08_COMPOSITE_EXPRESSIONS_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 08.04.2024 - 14:47:37 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py b/test/pytest/pytestfiles/test_09_COMPOSITE_EXPRESSIONS_BADCASE.py similarity index 97% rename from test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py rename to test/pytest/pytestfiles/test_09_COMPOSITE_EXPRESSIONS_BADCASE.py index f3762099..5f4fad9f 100644 --- a/test/pytest/pytestfiles/test_08_COMPOSITE_EXPRESSIONS_BADCASE.py +++ b/test/pytest/pytestfiles/test_09_COMPOSITE_EXPRESSIONS_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_08_COMPOSITE_EXPRESSIONS_BADCASE.py +# test_09_COMPOSITE_EXPRESSIONS_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 06.03.2024 - 15:51:02 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_09_CODE_COMMENTS_GOODCASE.py b/test/pytest/pytestfiles/test_10_CODE_COMMENTS_GOODCASE.py similarity index 95% rename from test/pytest/pytestfiles/test_09_CODE_COMMENTS_GOODCASE.py rename to test/pytest/pytestfiles/test_10_CODE_COMMENTS_GOODCASE.py index 4a314c92..f6691e0a 100644 --- a/test/pytest/pytestfiles/test_09_CODE_COMMENTS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_10_CODE_COMMENTS_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_09_CODE_COMMENTS_GOODCASE.py +# test_10_CODE_COMMENTS_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 18.10.2023 - 17:37:45 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py b/test/pytest/pytestfiles/test_11_COMMON_SYNTAX_VIOLATIONS_BADCASE.py similarity index 97% rename from test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py rename to test/pytest/pytestfiles/test_11_COMMON_SYNTAX_VIOLATIONS_BADCASE.py index 015e71b2..d9bbfa14 100644 --- a/test/pytest/pytestfiles/test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py +++ b/test/pytest/pytestfiles/test_11_COMMON_SYNTAX_VIOLATIONS_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_10_COMMON_SYNTAX_VIOLATIONS_BADCASE.py +# test_11_COMMON_SYNTAX_VIOLATIONS_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 10.10.2023 - 13:31:11 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py b/test/pytest/pytestfiles/test_12_IMPLICIT_CREATION_GOODCASE.py similarity index 97% rename from test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py rename to test/pytest/pytestfiles/test_12_IMPLICIT_CREATION_GOODCASE.py index 288a499a..10cc388a 100644 --- a/test/pytest/pytestfiles/test_11_IMPLICIT_CREATION_GOODCASE.py +++ b/test/pytest/pytestfiles/test_12_IMPLICIT_CREATION_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_11_IMPLICIT_CREATION_GOODCASE.py +# test_12_IMPLICIT_CREATION_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 20:03:38 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_12_IMPLICIT_CREATION_BADCASE.py b/test/pytest/pytestfiles/test_13_IMPLICIT_CREATION_BADCASE.py similarity index 98% rename from test/pytest/pytestfiles/test_12_IMPLICIT_CREATION_BADCASE.py rename to test/pytest/pytestfiles/test_13_IMPLICIT_CREATION_BADCASE.py index 2bf499e9..ebea1965 100644 --- a/test/pytest/pytestfiles/test_12_IMPLICIT_CREATION_BADCASE.py +++ b/test/pytest/pytestfiles/test_13_IMPLICIT_CREATION_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_12_IMPLICIT_CREATION_BADCASE.py +# test_13_IMPLICIT_CREATION_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 10.01.2024 - 12:25:22 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_13_CYCLIC_IMPORTS_BADCASE.py b/test/pytest/pytestfiles/test_14_CYCLIC_IMPORTS_BADCASE.py similarity index 96% rename from test/pytest/pytestfiles/test_13_CYCLIC_IMPORTS_BADCASE.py rename to test/pytest/pytestfiles/test_14_CYCLIC_IMPORTS_BADCASE.py index c38a70a3..63ba8d9a 100644 --- a/test/pytest/pytestfiles/test_13_CYCLIC_IMPORTS_BADCASE.py +++ b/test/pytest/pytestfiles/test_14_CYCLIC_IMPORTS_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_13_CYCLIC_IMPORTS_BADCASE.py +# test_14_CYCLIC_IMPORTS_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 09.01.2024 - 11:50:58 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_14_PATH_FORMATS_GOODCASE.py b/test/pytest/pytestfiles/test_15_PATH_FORMATS_GOODCASE.py similarity index 95% rename from test/pytest/pytestfiles/test_14_PATH_FORMATS_GOODCASE.py rename to test/pytest/pytestfiles/test_15_PATH_FORMATS_GOODCASE.py index 089c0276..7f72340e 100644 --- a/test/pytest/pytestfiles/test_14_PATH_FORMATS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_15_PATH_FORMATS_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_14_PATH_FORMATS_GOODCASE.py +# test_15_PATH_FORMATS_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 09.01.2024 - 11:50:58 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_15_BLOCKED_SLICING_BADCASE.py b/test/pytest/pytestfiles/test_16_BLOCKED_SLICING_BADCASE.py similarity index 98% rename from test/pytest/pytestfiles/test_15_BLOCKED_SLICING_BADCASE.py rename to test/pytest/pytestfiles/test_16_BLOCKED_SLICING_BADCASE.py index 90db7958..15ea20ac 100644 --- a/test/pytest/pytestfiles/test_15_BLOCKED_SLICING_BADCASE.py +++ b/test/pytest/pytestfiles/test_16_BLOCKED_SLICING_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_15_BLOCKED_SLICING_BADCASE.py +# test_16_BLOCKED_SLICING_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 25.03.2024 - 11:42:32 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_16_NESTED_LISTS_GOODCASE.py b/test/pytest/pytestfiles/test_17_NESTED_LISTS_GOODCASE.py similarity index 95% rename from test/pytest/pytestfiles/test_16_NESTED_LISTS_GOODCASE.py rename to test/pytest/pytestfiles/test_17_NESTED_LISTS_GOODCASE.py index 8ff1947b..a57ee943 100644 --- a/test/pytest/pytestfiles/test_16_NESTED_LISTS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_17_NESTED_LISTS_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_16_NESTED_LISTS_GOODCASE.py +# test_17_NESTED_LISTS_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 17:34:52 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_17_STRING_INDICES_GOODCASE.py b/test/pytest/pytestfiles/test_18_STRING_INDICES_GOODCASE.py similarity index 95% rename from test/pytest/pytestfiles/test_17_STRING_INDICES_GOODCASE.py rename to test/pytest/pytestfiles/test_18_STRING_INDICES_GOODCASE.py index d372bdb4..337a3b86 100644 --- a/test/pytest/pytestfiles/test_17_STRING_INDICES_GOODCASE.py +++ b/test/pytest/pytestfiles/test_18_STRING_INDICES_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_17_STRING_INDICES_GOODCASE.py +# test_18_STRING_INDICES_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 17:34:52 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_18_NOT_EXISTING_PARAMETERS_BADCASE.py b/test/pytest/pytestfiles/test_19_NOT_EXISTING_PARAMETERS_BADCASE.py similarity index 98% rename from test/pytest/pytestfiles/test_18_NOT_EXISTING_PARAMETERS_BADCASE.py rename to test/pytest/pytestfiles/test_19_NOT_EXISTING_PARAMETERS_BADCASE.py index 927bdc26..eab1e72d 100644 --- a/test/pytest/pytestfiles/test_18_NOT_EXISTING_PARAMETERS_BADCASE.py +++ b/test/pytest/pytestfiles/test_19_NOT_EXISTING_PARAMETERS_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_18_NOT_EXISTING_PARAMETERS_BADCASE.py +# test_19_NOT_EXISTING_PARAMETERS_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 17:34:52 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_19_LINE_BREAKS_GOODCASE.py b/test/pytest/pytestfiles/test_20_LINE_BREAKS_GOODCASE.py similarity index 95% rename from test/pytest/pytestfiles/test_19_LINE_BREAKS_GOODCASE.py rename to test/pytest/pytestfiles/test_20_LINE_BREAKS_GOODCASE.py index f63d22e3..f70070e9 100644 --- a/test/pytest/pytestfiles/test_19_LINE_BREAKS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_20_LINE_BREAKS_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_19_LINE_BREAKS_GOODCASE.py +# test_20_LINE_BREAKS_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 17:34:52 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_20_SELF_ASSIGNMENTS_GOODCASE.py b/test/pytest/pytestfiles/test_21_SELF_ASSIGNMENTS_GOODCASE.py similarity index 94% rename from test/pytest/pytestfiles/test_20_SELF_ASSIGNMENTS_GOODCASE.py rename to test/pytest/pytestfiles/test_21_SELF_ASSIGNMENTS_GOODCASE.py index cc277239..9e9d73d5 100644 --- a/test/pytest/pytestfiles/test_20_SELF_ASSIGNMENTS_GOODCASE.py +++ b/test/pytest/pytestfiles/test_21_SELF_ASSIGNMENTS_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_20_SELF_ASSIGNMENTS_GOODCASE.py +# test_21_SELF_ASSIGNMENTS_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 17:34:52 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_21_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py b/test/pytest/pytestfiles/test_22_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py similarity index 95% rename from test/pytest/pytestfiles/test_21_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py rename to test/pytest/pytestfiles/test_22_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py index f253da11..8f5509fa 100644 --- a/test/pytest/pytestfiles/test_21_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py +++ b/test/pytest/pytestfiles/test_22_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_21_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py +# test_22_ASSIGNMENTS_BY_REFERENCE_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 17.04.2024 - 17:34:52 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_22_PARAMETER_SCOPE_GOODCASE.py b/test/pytest/pytestfiles/test_23_PARAMETER_SCOPE_GOODCASE.py similarity index 97% rename from test/pytest/pytestfiles/test_22_PARAMETER_SCOPE_GOODCASE.py rename to test/pytest/pytestfiles/test_23_PARAMETER_SCOPE_GOODCASE.py index 90491143..1ca0190e 100644 --- a/test/pytest/pytestfiles/test_22_PARAMETER_SCOPE_GOODCASE.py +++ b/test/pytest/pytestfiles/test_23_PARAMETER_SCOPE_GOODCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_22_PARAMETER_SCOPE_GOODCASE.py +# test_23_PARAMETER_SCOPE_GOODCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 23.10.2024 - 19:41:03 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/pytest/pytestfiles/test_23_PARAMETER_SCOPE_BADCASE.py b/test/pytest/pytestfiles/test_24_PARAMETER_SCOPE_BADCASE.py similarity index 98% rename from test/pytest/pytestfiles/test_23_PARAMETER_SCOPE_BADCASE.py rename to test/pytest/pytestfiles/test_24_PARAMETER_SCOPE_BADCASE.py index bd45b987..d4f8b4c0 100644 --- a/test/pytest/pytestfiles/test_23_PARAMETER_SCOPE_BADCASE.py +++ b/test/pytest/pytestfiles/test_24_PARAMETER_SCOPE_BADCASE.py @@ -14,11 +14,11 @@ # limitations under the License. # -------------------------------------------------------------------------------------------------------------- # -# test_23_PARAMETER_SCOPE_BADCASE.py +# test_24_PARAMETER_SCOPE_BADCASE.py # -# XC-CT/ECA3-Queckenstedt +# XC-HWP/ESW3-Queckenstedt # -# 23.10.2024 - 19:41:03 +# 25.10.2024 - 20:31:28 # # -------------------------------------------------------------------------------------------------------------- diff --git a/test/testconfig/TestConfig.py b/test/testconfig/TestConfig.py index ec17bf79..59b655e2 100644 --- a/test/testconfig/TestConfig.py +++ b/test/testconfig/TestConfig.py @@ -22,7 +22,7 @@ # # -------------------------------------------------------------------------------------------------------------- # -# 23.10.2024 +# 25.10.2024 # # !!! Temporarily tests are deactivated by the following line commented out: # # # listofdictUsecases.append(dictUsecase) @@ -1618,130 +1618,99 @@ # -------------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0450" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing not allowed special characters" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0450.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0451" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (1)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0451.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0452" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (2)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0452.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0453" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (3)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0453.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0454" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (4)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0454.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0455" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (5)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0455.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0456" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (6)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0456.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase -# -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0457" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (7)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['TESTID'] = "JPP_0400" +dictUsecase['DESCRIPTION'] = "JSON file with several parameter names w.r.t. the naming convention" +dictUsecase['EXPECTATION'] = "All names are accepted (in definition and in reference)" dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['SUBSECTION'] = "GOODCASE" dictUsecase['HINT'] = None dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0457.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0400.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = None +dictUsecase['EXPECTEDRETURN'] = """ +[DOTDICT] (55/1) > {A} [INT] : 1 +[DOTDICT] (55/2) > {check01} [INT] : 1 +[DOTDICT] (55/3) > {_} [INT] : 3 +[DOTDICT] (55/4) > {check03} [INT] : 3 +[DOTDICT] (55/5) > {Ax} [INT] : 4 +[DOTDICT] (55/6) > {check04} [INT] : 4 +[DOTDICT] (55/7) > {0x} [INT] : 5 +[DOTDICT] (55/8) > {check05} [INT] : 5 +[DOTDICT] (55/9) > {_x} [INT] : 6 +[DOTDICT] (55/10) > {check06} [INT] : 6 +[DOTDICT] (55/11) > {param+1} [INT] : 7 +[DOTDICT] (55/12) > {check07} [INT] : 7 +[DOTDICT] (55/13) > {param-2} [INT] : 8 +[DOTDICT] (55/14) > {check08} [INT] : 8 +[DOTDICT] (55/15) > {param*3} [INT] : 9 +[DOTDICT] (55/16) > {check09} [INT] : 9 +[DOTDICT] (55/17) > {param/4} [INT] : 10 +[DOTDICT] (55/18) > {p01} [DOTDICT] (1/1) > {A} [INT] : 7 +[DOTDICT] (55/19) > {check11} [INT] : 7 +[DOTDICT] (55/20) > {p02} [DOTDICT] (1/1) > {0} [INT] : 8 +[DOTDICT] (55/21) > {check12} [INT] : 8 +[DOTDICT] (55/22) > {p03} [DOTDICT] (1/1) > {_} [INT] : 9 +[DOTDICT] (55/23) > {check13} [INT] : 9 +[DOTDICT] (55/24) > {p04} [DOTDICT] (1/1) > {Ax} [INT] : 10 +[DOTDICT] (55/25) > {check14} [INT] : 10 +[DOTDICT] (55/26) > {p05} [DOTDICT] (1/1) > {0x} [INT] : 11 +[DOTDICT] (55/27) > {check15} [INT] : 11 +[DOTDICT] (55/28) > {p06} [DOTDICT] (1/1) > {_x} [INT] : 12 +[DOTDICT] (55/29) > {check16} [INT] : 12 +[DOTDICT] (55/30) > {p07} [DOTDICT] (1/1) > {param+1} [INT] : 13 +[DOTDICT] (55/31) > {check17} [INT] : 13 +[DOTDICT] (55/32) > {p08} [DOTDICT] (1/1) > {param-2} [INT] : 14 +[DOTDICT] (55/33) > {check18} [INT] : 14 +[DOTDICT] (55/34) > {p09} [DOTDICT] (1/1) > {param*3} [INT] : 15 +[DOTDICT] (55/35) > {check19} [INT] : 15 +[DOTDICT] (55/36) > {p10} [DOTDICT] (1/1) > {param/4} [INT] : 16 +[DOTDICT] (55/37) > {p11} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/37) > {p11} [LIST] (3/2) > [DOTDICT] (1/1) > {A} [INT] : 17 +[DOTDICT] (55/37) > {p11} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/38) > {check21} [INT] : 17 +[DOTDICT] (55/39) > {p12} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/39) > {p12} [LIST] (3/2) > [DOTDICT] (1/1) > {0} [INT] : 18 +[DOTDICT] (55/39) > {p12} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/40) > {check22} [INT] : 18 +[DOTDICT] (55/41) > {p13} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/41) > {p13} [LIST] (3/2) > [DOTDICT] (1/1) > {_} [INT] : 19 +[DOTDICT] (55/41) > {p13} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/42) > {check23} [INT] : 19 +[DOTDICT] (55/43) > {p14} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/43) > {p14} [LIST] (3/2) > [DOTDICT] (1/1) > {Ax} [INT] : 20 +[DOTDICT] (55/43) > {p14} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/44) > {check24} [INT] : 20 +[DOTDICT] (55/45) > {p15} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/45) > {p15} [LIST] (3/2) > [DOTDICT] (1/1) > {0x} [INT] : 21 +[DOTDICT] (55/45) > {p15} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/46) > {check25} [INT] : 21 +[DOTDICT] (55/47) > {p16} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/47) > {p16} [LIST] (3/2) > [DOTDICT] (1/1) > {_x} [INT] : 22 +[DOTDICT] (55/47) > {p16} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/48) > {check26} [INT] : 22 +[DOTDICT] (55/49) > {p17} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/49) > {p17} [LIST] (3/2) > [DOTDICT] (1/1) > {param+1} [INT] : 23 +[DOTDICT] (55/49) > {p17} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/50) > {check27} [INT] : 23 +[DOTDICT] (55/51) > {p18} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/51) > {p18} [LIST] (3/2) > [DOTDICT] (1/1) > {param-2} [INT] : 24 +[DOTDICT] (55/51) > {p18} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/52) > {check28} [INT] : 24 +[DOTDICT] (55/53) > {p19} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/53) > {p19} [LIST] (3/2) > [DOTDICT] (1/1) > {param*3} [INT] : 25 +[DOTDICT] (55/53) > {p19} [LIST] (3/3) > [INT] : 2 +[DOTDICT] (55/54) > {check29} [INT] : 25 +[DOTDICT] (55/55) > {p20} [LIST] (3/1) > [INT] : 1 +[DOTDICT] (55/55) > {p20} [LIST] (3/2) > [DOTDICT] (1/1) > {param/4} [INT] : 26 +[DOTDICT] (55/55) > {p20} [LIST] (3/3) > [INT] : 2 +""" +listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- -dictUsecase = {} -dictUsecase['TESTID'] = "JPP_0458" -dictUsecase['DESCRIPTION'] = "JSON file with parameter name containing single not allowed special character (8)" -dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" -dictUsecase['SECTION'] = "NAMING_CONVENTION" -dictUsecase['SUBSECTION'] = "BADCASE" -dictUsecase['HINT'] = None -dictUsecase['COMMENT'] = None -dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_0458.jsonp" -dictUsecase['EXPECTEDEXCEPTION'] = None # # !!! expectation TODO / something like: "naming convention violation; allowed characters are ... only"!!! -dictUsecase['EXPECTEDRETURN'] = None -# # # listofdictUsecases.append(dictUsecase) -del dictUsecase + + + + # -------------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} diff --git a/test/testfiles/import/cyclic.1/cyclic.2/cyclic.3/jpp-test_config_cyclic.3.jsonp b/test/testfiles/import/cyclic.1/cyclic.2/cyclic.3/jpp-test_config_cyclic.3.jsonp index 33ddf3b7..3e42ad4b 100644 --- a/test/testfiles/import/cyclic.1/cyclic.2/cyclic.3/jpp-test_config_cyclic.3.jsonp +++ b/test/testfiles/import/cyclic.1/cyclic.2/cyclic.3/jpp-test_config_cyclic.3.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/import/cyclic.1/cyclic.2/jpp-test_config_cyclic.2.jsonp b/test/testfiles/import/cyclic.1/cyclic.2/jpp-test_config_cyclic.2.jsonp index b999f984..34f6b87d 100644 --- a/test/testfiles/import/cyclic.1/cyclic.2/jpp-test_config_cyclic.2.jsonp +++ b/test/testfiles/import/cyclic.1/cyclic.2/jpp-test_config_cyclic.2.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/import/cyclic.1/jpp-test_config_cyclic.1.jsonp b/test/testfiles/import/cyclic.1/jpp-test_config_cyclic.1.jsonp index 27eaa1ea..3db20098 100644 --- a/test/testfiles/import/cyclic.1/jpp-test_config_cyclic.1.jsonp +++ b/test/testfiles/import/cyclic.1/jpp-test_config_cyclic.1.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/import/import.1/import.1.1/jpp-test_config_implicit_creation.1.1.1.jsonp b/test/testfiles/import/import.1/import.1.1/jpp-test_config_implicit_creation.1.1.1.jsonp index fe64d20c..d9d52696 100644 --- a/test/testfiles/import/import.1/import.1.1/jpp-test_config_implicit_creation.1.1.1.jsonp +++ b/test/testfiles/import/import.1/import.1.1/jpp-test_config_implicit_creation.1.1.1.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/import/import.1/import.1.1/jpp-test_config_relative_jsonfile_path.jsonp b/test/testfiles/import/import.1/import.1.1/jpp-test_config_relative_jsonfile_path.jsonp index 002061ae..27cb99b7 100644 --- a/test/testfiles/import/import.1/import.1.1/jpp-test_config_relative_jsonfile_path.jsonp +++ b/test/testfiles/import/import.1/import.1.1/jpp-test_config_relative_jsonfile_path.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/import/import.1/jpp-test_config_implicit_creation.1.1.jsonp b/test/testfiles/import/import.1/jpp-test_config_implicit_creation.1.1.jsonp index 1a57b9e4..fdef993d 100644 --- a/test/testfiles/import/import.1/jpp-test_config_implicit_creation.1.1.jsonp +++ b/test/testfiles/import/import.1/jpp-test_config_implicit_creation.1.1.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/import/jpp-test_config_implicit_creation.1.jsonp b/test/testfiles/import/jpp-test_config_implicit_creation.1.jsonp index 11d3414f..f2f70c25 100644 --- a/test/testfiles/import/jpp-test_config_implicit_creation.1.jsonp +++ b/test/testfiles/import/jpp-test_config_implicit_creation.1.jsonp @@ -1,4 +1,4 @@ -// Copyright 2020-2023 Robert Bosch GmbH +// 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. diff --git a/test/testfiles/jpp-test_config_0400.jsonp b/test/testfiles/jpp-test_config_0400.jsonp new file mode 100644 index 00000000..4b4d79ef --- /dev/null +++ b/test/testfiles/jpp-test_config_0400.jsonp @@ -0,0 +1,90 @@ +// 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. +//************************************************************************** +{ + "A" : 1, + "check01" : ${A}, + // Bug: https://github.com/test-fullautomation/python-jsonpreprocessor/issues/357#issuecomment-2435677836 + // 'The parameter '${0}' is not available!'! + // "0" : 2, + // "check02" : ${0}, + "_" : 3, + "check03" : ${_}, + // + "Ax" : 4, + "check04" : ${Ax}, + "0x" : 5, + "check05" : ${0x}, + "_x" : 6, + "check06" : ${_x}, + // + "param+1" : 7, + "check07" : ${param+1}, + "param-2" : 8, + "check08" : ${param-2}, + "param*3" : 9, + "check09" : ${param*3}, + "param/4" : 10, + // bug: https://github.com/test-fullautomation/python-jsonpreprocessor/issues/356#issuecomment-2435708593 + // Expecting ',' delimiter + // "check10" : ${param/4}, + // + "p01" : {"A" : 7}, + "check11" : ${p01}['A'], + "p02" : {"0" : 8}, + "check12" : ${p02}['0'], + "p03" : {"_" : 9}, + "check13" : ${p03}['_'], + // + "p04" : {"Ax" : 10}, + "check14" : ${p04}['Ax'], + "p05" : {"0x" : 11}, + "check15" : ${p05}['0x'], + "p06" : {"_x" : 12}, + "check16" : ${p06}['_x'], + // + "p07" : {"param+1" : 13}, + "check17" : ${p07}['param+1'], + "p08" : {"param-2" : 14}, + "check18" : ${p08}['param-2'], + "p09" : {"param*3" : 15}, + "check19" : ${p09}['param*3'], + "p10" : {"param/4" : 16}, + // Expecting ',' delimiter + // "check20" : ${p10}['param/4'], + // + "p11" : [1, {"A" : 17}, 2], + "check21" : ${p11}[1]['A'], + "p12" : [1, {"0" : 18}, 2], + "check22" : ${p12}[1]['0'], + "p13" : [1, {"_" : 19}, 2], + "check23" : ${p13}[1]['_'], + // + "p14" : [1, {"Ax" : 20}, 2], + "check24" : ${p14}[1]['Ax'], + "p15" : [1, {"0x" : 21}, 2], + "check25" : ${p15}[1]['0x'], + "p16" : [1, {"_x" : 22}, 2], + "check26" : ${p16}[1]['_x'], + // // + "p17" : [1, {"param+1" : 23}, 2], + "check27" : ${p17}[1]['param+1'], + "p18" : [1, {"param-2" : 24}, 2], + "check28" : ${p18}[1]['param-2'], + "p19" : [1, {"param*3" : 25}, 2], + "check29" : ${p19}[1]['param*3'], + "p20" : [1, {"param/4" : 26}, 2] + // Expecting ',' delimiter + // "check30" : ${p20}[1]['param/4'] +} diff --git a/test/testfiles/jpp-test_config_0450.jsonp b/test/testfiles/jpp-test_config_0450.jsonp deleted file mode 100644 index 73596034..00000000 --- a/test/testfiles/jpp-test_config_0450.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "$/{/}/[/]/&/#/,/;/:" : "string" -} diff --git a/test/testfiles/jpp-test_config_0451.jsonp b/test/testfiles/jpp-test_config_0451.jsonp deleted file mode 100644 index a07bd570..00000000 --- a/test/testfiles/jpp-test_config_0451.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "param-1" : "value" -} diff --git a/test/testfiles/jpp-test_config_0452.jsonp b/test/testfiles/jpp-test_config_0452.jsonp deleted file mode 100644 index 26f8ccac..00000000 --- a/test/testfiles/jpp-test_config_0452.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "param/1" : "value" -} diff --git a/test/testfiles/jpp-test_config_0453.jsonp b/test/testfiles/jpp-test_config_0453.jsonp deleted file mode 100644 index dda2b780..00000000 --- a/test/testfiles/jpp-test_config_0453.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "param\\1" : "value" -} diff --git a/test/testfiles/jpp-test_config_0454.jsonp b/test/testfiles/jpp-test_config_0454.jsonp deleted file mode 100644 index 38d73220..00000000 --- a/test/testfiles/jpp-test_config_0454.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "param\\\\1" : "value" -} diff --git a/test/testfiles/jpp-test_config_0455.jsonp b/test/testfiles/jpp-test_config_0455.jsonp deleted file mode 100644 index 7ddc56ef..00000000 --- a/test/testfiles/jpp-test_config_0455.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "dictParam" : {"key-A" : 1, "keyB" : 2} -} diff --git a/test/testfiles/jpp-test_config_0456.jsonp b/test/testfiles/jpp-test_config_0456.jsonp deleted file mode 100644 index 44df76dc..00000000 --- a/test/testfiles/jpp-test_config_0456.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "dictParam" : {"key/A" : 1, "keyB" : 2} -} diff --git a/test/testfiles/jpp-test_config_0457.jsonp b/test/testfiles/jpp-test_config_0457.jsonp deleted file mode 100644 index 390e9b1f..00000000 --- a/test/testfiles/jpp-test_config_0457.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "dictParam" : {"key\\A" : 1, "keyB" : 2} -} diff --git a/test/testfiles/jpp-test_config_0458.jsonp b/test/testfiles/jpp-test_config_0458.jsonp deleted file mode 100644 index d59aa543..00000000 --- a/test/testfiles/jpp-test_config_0458.jsonp +++ /dev/null @@ -1,17 +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. -//************************************************************************** -{ - "dictParam" : {"key\\\\A" : 1, "keyB" : 2} -}