test-fullautomation · test-fullautomation · Aug 10, 2023 · Jul 20, 2023 · Jul 20, 2023 · Jul 20, 2023
diff --git a/JsonPreprocessor/CJsonPreprocessor.py b/JsonPreprocessor/CJsonPreprocessor.py
diff --git a/atest/jsonpreprocessor/test_jsonpreprocessor.py b/atest/jsonpreprocessor/test_jsonpreprocessor.py
@@ -348,15 +348,15 @@ def test_none_true_false_datatype(self):
         sJsonfile = os.path.abspath("../testdata/config/06_override_params/project_config_04.json")
         oJsonPreprocessor = CJsonPreprocessor(syntax="python")
         oJsonData = oJsonPreprocessor.jsonLoad(sJsonfile)
-        assert oJsonData['string_null'] == "null"
-        assert oJsonData['string_none'] == '"None"'
-        assert oJsonData['string_true'] == '"True"'
-        assert oJsonData['string_false'] == '"False"'
-        assert oJsonData['convert_null_to_string'] == '"None"'
-        assert oJsonData['convert_none_to_string'] == '"None"'
+        assert oJsonData['string_null'] == 'null'
+        assert oJsonData['string_none'] == 'None'
+        assert oJsonData['string_true'] == 'True'
+        assert oJsonData['string_false'] == 'False'
+        assert oJsonData['convert_null_to_string'] == 'None'
+        assert oJsonData['convert_none_to_string'] == 'None'
         assert oJsonData['convert_float_to_string'] == "1.332"
-        assert oJsonData['convert_true_to_string'] == '"True"'
-        assert oJsonData['convert_false_to_string'] == '"False"'
+        assert oJsonData['convert_true_to_string'] == 'True'
+        assert oJsonData['convert_false_to_string'] == 'False'
         assert oJsonData['params']['global'] == JSONFORMAT_NONE_TRUE_FALSE['params']['global']
         assert oJsonData['preprocessor']['definitions'] == JSONFORMAT_NONE_TRUE_FALSE['preprocessor']['definitions']
 

diff --git a/atest/testdata/config/05_sub_datastructure/json_update_02.json b/atest/testdata/config/05_sub_datastructure/json_update_02.json
@@ -15,6 +15,6 @@
 
 {
   ${params}['glo']['globalString']: "Welcome to Jsonpreprocessor Acceptance Test",
-  "${preprocessor}['definitions']['preproStructure']['variable_01']": 0.192,
+  ${preprocessor}['definitions']['preproStructure']['variable_01']: 0.192,
   ${Project}: "Acceptance Testing"
 }
diff --git a/atest/testdata/config/05_sub_datastructure/json_update_05.json b/atest/testdata/config/05_sub_datastructure/json_update_05.json
@@ -14,5 +14,5 @@
 //**************************************************************************
 
 {
-  "${preprocessor}['definitions']['preproTest'][${preprocessor}['definitions']['preproStructure']['variable_02']]": ${params}['glo']['globalString']
+  ${preprocessor}['definitions']['preproTest'][${preprocessor}['definitions']['preproStructure']['variable_02']]: ${params}['glo']['globalString']
 }
diff --git a/atest/testdata/config/05_sub_datastructure/json_update_06.json b/atest/testdata/config/05_sub_datastructure/json_update_06.json
@@ -16,7 +16,6 @@
 {
   ${sWelcome}: ${Project},
   ${params}['glo']['globalIntParam']: 69,
-  ${preprocessor}['definitions']['preproStructure']['variable_01']: ${preprocessor}['definitions']['preproStructure']['newStruct']['check1'],
   "params": {
     "glo": {
       "globalFloatParam": 97,
@@ -37,5 +36,6 @@
         "param_01": "Updated new value"
       }
     }
-  }
+  },
+  ${preprocessor}['definitions']['preproStructure']['variable_01']: ${preprocessor}['definitions']['preproStructure']['newStruct']['check1']
 }
diff --git a/atest/testdata/config/06_override_params/project_config_02.json b/atest/testdata/config/06_override_params/project_config_02.json
@@ -23,7 +23,7 @@
    "Project":"JsonPreprocessor",
    "Descriptioin":"Json Preprocessor Acceptance Test",
    "[import]": "./common/definitions_common.json",
-   "${gPreproString}": "Override string param in imported file.",
+   ${gPreproString}: "Override string param in imported file.",
    "params":{
      "global":{
 	   "dSUT":{

diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html
@@ -860,7 +860,7 @@
 </tbody></table></div>
 <div>&nbsp;</div>
 <hr width="100%" color="#FF8C00" align="center">
-<div align="center"><font size="2" color="#27408B">Generated: 09.08.2023 - 11:47:23</font></div>
+<div align="center"><font size="2" color="#27408B">Generated: 09.08.2023 - 17:28:15</font></div>
 <div>&nbsp;</div>
 </body></html>
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst
@@ -273,5 +273,5 @@ Test Use Cases
 
 ----
 
-Generated: 09.08.2023 - 11:47:23
+Generated: 09.08.2023 - 17:28:15
 
diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt
@@ -119,5 +119,5 @@ Test JPP_0954 / COMMON_SYNTAX_VIOLATIONS / BADCASE
 Description: JSON file with syntax error (5): file is empty (multiple pairs of brackets only)
 Expectation: No values are returned, and JsonPreprocessor throws an exception
 ------------------------------------------------------------------------------------------------------------------------
-Generated: 09.08.2023 - 11:47:23
+Generated: 09.08.2023 - 17:28:15
 
diff --git a/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py b/test/pytest/pytestfiles/test_01_DATA_TYPES_GOODCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py b/test/pytest/pytestfiles/test_02_DATA_INTEGRITY_GOODCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py b/test/pytest/pytestfiles/test_03_PARAMETER_SUBSTITUTION_GOODCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git 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
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py b/test/pytest/pytestfiles/test_05_VALUE_DETECTION_GOODCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py b/test/pytest/pytestfiles/test_06_VALUE_DETECTION_BADCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py b/test/pytest/pytestfiles/test_07_COMPOSITE_EXPRESSIONS_GOODCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_08_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py b/test/pytest/pytestfiles/test_08_COMMON_SYNTAX_VIOLATIONS_GOODCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
 

diff --git a/test/pytest/pytestfiles/test_09_COMMON_SYNTAX_VIOLATIONS_BADCASE.py b/test/pytest/pytestfiles/test_09_COMMON_SYNTAX_VIOLATIONS_BADCASE.py
@@ -18,7 +18,7 @@
 #
 # XC-CT/ECA3-Queckenstedt
 #
-# 09.08.2023 - 11:47:23
+# 09.08.2023 - 17:28:15
 #
 # --------------------------------------------------------------------------------------------------------------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -273,5 +273,5 @@ Test Use Cases

		----

		Generated: 09.08.2023 - 11:47:23
		Generated: 09.08.2023 - 17:28:15