diff --git a/test/JPP_TestUsecases.csv b/test/JPP_TestUsecases.csv index 1519036..d347b4a 100644 --- a/test/JPP_TestUsecases.csv +++ b/test/JPP_TestUsecases.csv @@ -139,6 +139,8 @@ JPP_1157|FILE_IMPORTS|BADCASE|JSON file with syntax error in import path (2) JPP_1158|FILE_IMPORTS|BADCASE|JSON file with error in [import] key (1) JPP_1159|FILE_IMPORTS|BADCASE|JSON file with error in [import] key (2) JPP_1160|FILE_IMPORTS|BADCASE|JSON file with error in imported file +JPP_1165|FILE_IMPORTS|BADCASE|JSON file with cyclic imports (sawtooth, stopped) +JPP_1166|FILE_IMPORTS|BADCASE|JSON file with cyclic imports (sawtooth, endless) JPP_1200|PATH_FORMATS|GOODCASE|Relative path to JSON file JPP_1350|BLOCKED_SLICING|BADCASE|JSON file with blocked slicing notation (-1) JPP_1351|BLOCKED_SLICING|BADCASE|JSON file with blocked slicing notation (-1) diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html index 664a4eb..8aa0c7b 100644 --- a/test/JPP_TestUsecases.html +++ b/test/JPP_TestUsecases.html @@ -4659,6 +4659,74 @@ 140 + + + +JPP_1165 + + + + +FILE_IMPORTS + + + + +BADCASE + + + + +JSON file with cyclic imports (sawtooth, stopped)
+Expected: No values are returned, and JsonPreprocessor throws an exception +
+Cyclic import + + + + + + + + + +141 + + + + + +JPP_1166 + + + + +FILE_IMPORTS + + + + +BADCASE + + + + +JSON file with cyclic imports (sawtooth, endless)
+Expected: No values are returned, and JsonPreprocessor throws an exception +
+Cyclic import + + + + + + + + + +142 + + @@ -4690,7 +4758,7 @@ -141 +143 @@ -4723,7 +4791,7 @@ -142 +144 @@ -4756,7 +4824,7 @@ -143 +145 @@ -4789,7 +4857,7 @@ -144 +146 @@ -4822,7 +4890,7 @@ -145 +147 @@ -4855,7 +4923,7 @@ -146 +148 @@ -4888,7 +4956,7 @@ -147 +149 @@ -4921,7 +4989,7 @@ -148 +150 @@ -4954,7 +5022,7 @@ -149 +151 @@ -4987,7 +5055,7 @@ -150 +152 @@ -5020,7 +5088,7 @@ -151 +153 @@ -5053,7 +5121,7 @@ -152 +154 @@ -5086,7 +5154,7 @@ -153 +155 @@ -5119,7 +5187,7 @@ -154 +156 @@ -5152,7 +5220,7 @@ -155 +157 @@ -5185,7 +5253,7 @@ -156 +158 @@ -5218,7 +5286,7 @@ -157 +159 @@ -5251,7 +5319,7 @@ -158 +160 @@ -5284,7 +5352,7 @@ -159 +161 @@ -5317,7 +5385,7 @@ -160 +162 @@ -5350,7 +5418,7 @@ -161 +163 @@ -5383,7 +5451,7 @@ -162 +164 @@ -5416,7 +5484,7 @@ -163 +165 @@ -5449,7 +5517,7 @@ -164 +166 @@ -5482,7 +5550,7 @@ -165 +167 @@ -5515,7 +5583,7 @@ -166 +168 @@ -5548,7 +5616,7 @@ -167 +169 @@ -5581,7 +5649,7 @@ -168 +170 @@ -5614,7 +5682,7 @@ -169 +171 @@ -5647,7 +5715,7 @@ -170 +172 @@ -5680,7 +5748,7 @@ -171 +173 @@ -5713,7 +5781,7 @@ -172 +174 @@ -5746,7 +5814,7 @@ -173 +175 @@ -5779,7 +5847,7 @@ -174 +176 @@ -5812,7 +5880,7 @@ -175 +177 @@ -5845,7 +5913,7 @@ -176 +178 @@ -5878,7 +5946,7 @@ -177 +179 @@ -5911,7 +5979,7 @@ -178 +180 @@ -5944,7 +6012,7 @@ -179 +181 @@ -5977,7 +6045,7 @@ -180 +182 @@ -6010,7 +6078,7 @@ -181 +183 @@ -6043,7 +6111,7 @@ -182 +184 @@ -6076,7 +6144,7 @@ -183 +185 @@ -6109,7 +6177,7 @@ -184 +186 @@ -6142,7 +6210,7 @@ -185 +187 @@ -6175,7 +6243,7 @@ -186 +188 @@ -6208,7 +6276,7 @@ -187 +189 @@ -6241,7 +6309,7 @@ -188 +190 @@ -6274,7 +6342,7 @@ -189 +191 @@ -6307,7 +6375,7 @@ -190 +192 @@ -6340,7 +6408,7 @@ -191 +193 @@ -6373,7 +6441,7 @@
 
-
Generated: 15.11.2024 - 19:28:03
+
Generated: 18.11.2024 - 15:10:55
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst index 47ae595..d6733a8 100644 --- a/test/JPP_TestUsecases.rst +++ b/test/JPP_TestUsecases.rst @@ -1481,6 +1481,30 @@ Test Use Cases ---- +* **Test JPP_1165** + + [FILE_IMPORTS / BADCASE] + + **JSON file with cyclic imports (sawtooth, stopped)** + + Expected: No values are returned, and JsonPreprocessor throws an exception + + *Comment: Cyclic import* + +---- + +* **Test JPP_1166** + + [FILE_IMPORTS / BADCASE] + + **JSON file with cyclic imports (sawtooth, endless)** + + Expected: No values are returned, and JsonPreprocessor throws an exception + + *Comment: Cyclic import* + +---- + * **Test JPP_1200** [PATH_FORMATS / GOODCASE] @@ -2003,5 +2027,5 @@ Test Use Cases ---- -Generated: 15.11.2024 - 19:28:03 +Generated: 18.11.2024 - 15:10:55 diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt index f26ddf0..2ef7f16 100644 --- a/test/JPP_TestUsecases.txt +++ b/test/JPP_TestUsecases.txt @@ -609,6 +609,16 @@ Test JPP_1160 / FILE_IMPORTS / BADCASE Description: JSON file with error in imported file Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ +Test JPP_1165 / FILE_IMPORTS / BADCASE +Description: JSON file with cyclic imports (sawtooth, stopped) +Expectation: No values are returned, and JsonPreprocessor throws an exception +Comment....: Cyclic import +------------------------------------------------------------------------------------------------------------------------ +Test JPP_1166 / FILE_IMPORTS / BADCASE +Description: JSON file with cyclic imports (sawtooth, endless) +Expectation: No values are returned, and JsonPreprocessor throws an exception +Comment....: Cyclic import +------------------------------------------------------------------------------------------------------------------------ Test JPP_1200 / PATH_FORMATS / GOODCASE Description: Relative path to JSON file Expectation: JsonPreprocessor resolves the relative path and returns values from JSON file @@ -818,5 +828,5 @@ Test JPP_2058 / PARAMETER_SCOPE / BADCASE Description: JSON file containing a parameter with missing scope (9) Expectation: No values are returned, and JsonPreprocessor throws an exception ------------------------------------------------------------------------------------------------------------------------ -Generated: 15.11.2024 - 19:28:03 +Generated: 18.11.2024 - 15:10:55 diff --git a/test/component_test.py b/test/component_test.py index da910c3..56022d2 100644 --- a/test/component_test.py +++ b/test/component_test.py @@ -22,8 +22,8 @@ # # -------------------------------------------------------------------------------------------------------------- # -VERSION = "0.53.0" -VERSION_DATE = "15.11.2024" +VERSION = "0.54.0" +VERSION_DATE = "18.11.2024" # # -------------------------------------------------------------------------------------------------------------- #TM*** diff --git a/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py b/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py index a2dd97b..ffa5afb 100644 --- a/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py +++ b/test/pytest/pytestfiles/test_16_FILE_IMPORTS_BADCASE.py @@ -18,7 +18,7 @@ # # XC-HWP/ESW3-Queckenstedt # -# 15.11.2024 - 19:28:03 +# 18.11.2024 - 15:10:55 # # -------------------------------------------------------------------------------------------------------------- @@ -117,4 +117,20 @@ def test_JPP_1159(self, Description): def test_JPP_1160(self, Description): nReturn = CExecute.Execute("JPP_1160") assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with cyclic imports (sawtooth, stopped)",] + ) + def test_JPP_1165(self, Description): + nReturn = CExecute.Execute("JPP_1165") + assert nReturn == 0 +# -------------------------------------------------------------------------------------------------------------- + # Expected: No values are returned, and JsonPreprocessor throws an exception + @pytest.mark.parametrize( + "Description", ["JSON file with cyclic imports (sawtooth, endless)",] + ) + def test_JPP_1166(self, Description): + nReturn = CExecute.Execute("JPP_1166") + assert nReturn == 0 # -------------------------------------------------------------------------------------------------------------- diff --git a/test/testconfig/TestConfig.py b/test/testconfig/TestConfig.py index 3b59681..9596014 100644 --- a/test/testconfig/TestConfig.py +++ b/test/testconfig/TestConfig.py @@ -22,7 +22,7 @@ # # -------------------------------------------------------------------------------------------------------------- # -# 15.11.2024 +# 18.11.2024 # # !!! Temporarily tests are deactivated by the following line commented out: # # # listofdictUsecases.append(dictUsecase) @@ -3295,6 +3295,39 @@ # # # listofdictUsecases.append(dictUsecase) del dictUsecase # -------------------------------------------------------------------------------------------------------------- +dictUsecase = {} +# Cyclic import is detected, but file list in exception should be checked. +# Similar to: https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +# Here: 'imported.ST03.1.jsonp' is not expected to be part of file list in exception. +dictUsecase['TESTID'] = "JPP_1165" +dictUsecase['DESCRIPTION'] = "JSON file with cyclic imports (sawtooth, stopped)" +dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['SECTION'] = "FILE_IMPORTS" +dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['HINT'] = None +dictUsecase['COMMENT'] = "Cyclic import" +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1165.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" # file list to be fixed +dictUsecase['EXPECTEDRETURN'] = None +listofdictUsecases.append(dictUsecase) +del dictUsecase +# -------------------------------------------------------------------------------------------------------------- +dictUsecase = {} +# Cyclic import is detected, but file list in exception is not correct. +# Similar to: https://github.com/test-fullautomation/python-jsonpreprocessor/issues/389 +dictUsecase['TESTID'] = "JPP_1166" +dictUsecase['DESCRIPTION'] = "JSON file with cyclic imports (sawtooth, endless)" +dictUsecase['EXPECTATION'] = "No values are returned, and JsonPreprocessor throws an exception" +dictUsecase['SECTION'] = "FILE_IMPORTS" +dictUsecase['SUBSECTION'] = "BADCASE" +dictUsecase['HINT'] = None +dictUsecase['COMMENT'] = "Cyclic import" +dictUsecase['JSONFILE'] = r"..\testfiles\jpp-test_config_1166.jsonp" +dictUsecase['EXPECTEDEXCEPTION'] = "Cyclic imported json file" # file list to be fixed +dictUsecase['EXPECTEDRETURN'] = None +listofdictUsecases.append(dictUsecase) +del dictUsecase +# -------------------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------------------- dictUsecase = {} dictUsecase['TESTID'] = "JPP_1200" diff --git a/test/testfiles/dynamic_imports/AA/ST01/imported.ST01.1.jsonp b/test/testfiles/dynamic_imports/AA/ST01/imported.ST01.1.jsonp new file mode 100644 index 0000000..a356cd5 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/ST01/imported.ST01.1.jsonp @@ -0,0 +1,19 @@ +// 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. +//************************************************************************** +{ + "level" : "ST01", + "indicator" : "ST02", + "[import]" : "../imported.AA.ST.1.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/ST01/imported.ST01.2.jsonp b/test/testfiles/dynamic_imports/AA/ST01/imported.ST01.2.jsonp new file mode 100644 index 0000000..5d2dba4 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/ST01/imported.ST01.2.jsonp @@ -0,0 +1,19 @@ +// 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. +//************************************************************************** +{ + "level" : "ST01", + "indicator" : "ST02", + "[import]" : "../imported.AA.ST.2.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/ST02/imported.ST02.1.jsonp b/test/testfiles/dynamic_imports/AA/ST02/imported.ST02.1.jsonp new file mode 100644 index 0000000..2946af1 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/ST02/imported.ST02.1.jsonp @@ -0,0 +1,19 @@ +// 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. +//************************************************************************** +{ + "level" : "ST02", + "indicator" : "ST03", + "[import]" : "../imported.AA.ST.1.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/ST02/imported.ST02.2.jsonp b/test/testfiles/dynamic_imports/AA/ST02/imported.ST02.2.jsonp new file mode 100644 index 0000000..1e6bcd9 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/ST02/imported.ST02.2.jsonp @@ -0,0 +1,19 @@ +// 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. +//************************************************************************** +{ + "level" : "ST02", + "indicator" : "ST03", + "[import]" : "../imported.AA.ST.2.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/ST03/imported.ST03.1.jsonp b/test/testfiles/dynamic_imports/AA/ST03/imported.ST03.1.jsonp new file mode 100644 index 0000000..b5aa4ef --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/ST03/imported.ST03.1.jsonp @@ -0,0 +1,20 @@ +// 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. +//************************************************************************** +{ + "level" : "ST03" + // stopping here! + // handled in ST.2 (endless loop): // "indicator" : "ST01", + // handled in ST.2 (endless loop): // "[import]" : "../imported.AA.ST.1.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/ST03/imported.ST03.2.jsonp b/test/testfiles/dynamic_imports/AA/ST03/imported.ST03.2.jsonp new file mode 100644 index 0000000..b4d65f4 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/ST03/imported.ST03.2.jsonp @@ -0,0 +1,20 @@ +// 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. +//************************************************************************** +{ + "level" : "ST03", + // would be an endless loop if 'cyclic import' detection would not stop the computation: + "indicator" : "ST01", + "[import]" : "../imported.AA.ST.2.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/imported.AA.ST.1.jsonp b/test/testfiles/dynamic_imports/AA/imported.AA.ST.1.jsonp new file mode 100644 index 0000000..5f3eb18 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/imported.AA.ST.1.jsonp @@ -0,0 +1,17 @@ +// 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. +//************************************************************************** +{ + "[import]" : "./${indicator}/imported.${indicator}.1.jsonp" +} diff --git a/test/testfiles/dynamic_imports/AA/imported.AA.ST.2.jsonp b/test/testfiles/dynamic_imports/AA/imported.AA.ST.2.jsonp new file mode 100644 index 0000000..47c7d15 --- /dev/null +++ b/test/testfiles/dynamic_imports/AA/imported.AA.ST.2.jsonp @@ -0,0 +1,17 @@ +// 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. +//************************************************************************** +{ + "[import]" : "./${indicator}/imported.${indicator}.2.jsonp" +} diff --git a/test/testfiles/dynamic_imports/sawtooth_import.1.jsonp b/test/testfiles/dynamic_imports/sawtooth_import.1.jsonp new file mode 100644 index 0000000..c2c665e --- /dev/null +++ b/test/testfiles/dynamic_imports/sawtooth_import.1.jsonp @@ -0,0 +1,18 @@ +// 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. +//************************************************************************** +{ + "indicator" : "ST01", + "[import]" : "./AA/imported.AA.ST.1.jsonp" +} diff --git a/test/testfiles/dynamic_imports/sawtooth_import.2.jsonp b/test/testfiles/dynamic_imports/sawtooth_import.2.jsonp new file mode 100644 index 0000000..be4a156 --- /dev/null +++ b/test/testfiles/dynamic_imports/sawtooth_import.2.jsonp @@ -0,0 +1,18 @@ +// 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. +//************************************************************************** +{ + "indicator" : "ST01", + "[import]" : "./AA/imported.AA.ST.2.jsonp" +} diff --git a/test/testfiles/jpp-test_config_1165.jsonp b/test/testfiles/jpp-test_config_1165.jsonp new file mode 100644 index 0000000..d94bebd --- /dev/null +++ b/test/testfiles/jpp-test_config_1165.jsonp @@ -0,0 +1,18 @@ +// 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. +//************************************************************************** +{ + "imports_dir" : "dynamic_imports", + "[import]" : "./${imports_dir}/sawtooth_import.1.jsonp" +} \ No newline at end of file diff --git a/test/testfiles/jpp-test_config_1166.jsonp b/test/testfiles/jpp-test_config_1166.jsonp new file mode 100644 index 0000000..bad9500 --- /dev/null +++ b/test/testfiles/jpp-test_config_1166.jsonp @@ -0,0 +1,18 @@ +// 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. +//************************************************************************** +{ + "imports_dir" : "dynamic_imports", + "[import]" : "./${imports_dir}/sawtooth_import.2.jsonp" +} \ No newline at end of file diff --git a/test/testtools/GenSnippetsJPP.py b/test/testtools/GenSnippetsJPP.py index f48772b..b8469eb 100644 --- a/test/testtools/GenSnippetsJPP.py +++ b/test/testtools/GenSnippetsJPP.py @@ -22,8 +22,8 @@ # # ************************************************************************************************************** # -VERSION = "0.33.0" -VERSION_DATE = "15.11.2024" +VERSION = "0.34.0" +VERSION_DATE = "18.11.2024" # # ************************************************************************************************************** @@ -3333,16 +3333,32 @@ def GetSeveralParticularSnippets(self): } """) + # cyclic import listCodeSnippets.append("""{ "imports_dir" : "dynamic_imports", "[import]" : "./${imports_dir}/cyclic_import_itself.jsonp" } """) + # cyclic import listCodeSnippets.append("""{ "imports_dir" : "dynamic_imports", "[import]" : "./${imports_dir}/cyclic_import.jsonp" } +""") + + # cyclic import (sawtooth, stopped) + listCodeSnippets.append("""{ + "imports_dir" : "dynamic_imports", + "[import]" : "./${imports_dir}/sawtooth_import.1.jsonp" +} +""") + + # cyclic import (sawtooth, endless) + listCodeSnippets.append("""{ + "imports_dir" : "dynamic_imports", + "[import]" : "./${imports_dir}/sawtooth_import.2.jsonp" +} """) listCodeSnippets.append("""{