From 910bc8989a18b8011ea87c5795102a94171943e5 Mon Sep 17 00:00:00 2001
From: qth2hi <holger.queckenstedt@de.bosch.com>
Date: Wed, 2 Aug 2023 14:46:02 +0200
Subject: [PATCH] Self test adapted to latest changes in JsonPreprocessor

---
 test/JPP_TestUsecases.html    | 5 ++---
 test/JPP_TestUsecases.rst     | 4 +---
 test/JPP_TestUsecases.txt     | 3 +--
 test/component_test.py        | 4 ++--
 test/testconfig/TestConfig.py | 4 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/test/JPP_TestUsecases.html b/test/JPP_TestUsecases.html
index 15ca1b3b..07e073a8 100644
--- a/test/JPP_TestUsecases.html
+++ b/test/JPP_TestUsecases.html
@@ -2593,8 +2593,7 @@
 <b>JSON file with composite data structure (some dictionaries)</b><br>
 Expected: JsonPreprocessor returns expected value
 
-<br>
-!!! some parts commented out; to be activated after bugfixes are available
+
 </i></font></td>
 
 
@@ -2902,7 +2901,7 @@
 </tbody></table></div>
 <div>&nbsp;</div>
 <hr width="100%" color="#FF8C00" align="center">
-<div align="center"><font size="2" color="#27408B">Generated: 18.07.2023 - 15:09:36</font></div>
+<div align="center"><font size="2" color="#27408B">Generated: 02.08.2023 - 14:43:07</font></div>
 <div>&nbsp;</div>
 </body></html>
 
diff --git a/test/JPP_TestUsecases.rst b/test/JPP_TestUsecases.rst
index 269fbd8e..bf65d2f2 100644
--- a/test/JPP_TestUsecases.rst
+++ b/test/JPP_TestUsecases.rst
@@ -843,8 +843,6 @@ Test Use Cases
 
    Expected: JsonPreprocessor returns expected value
 
-   *Hint: !!! some parts commented out; to be activated after bugfixes are available*
-
 ----
 
 * **Test JPP_0505**
@@ -941,5 +939,5 @@ Test Use Cases
 
 ----
 
-Generated: 18.07.2023 - 15:09:36
+Generated: 02.08.2023 - 14:43:07
 
diff --git a/test/JPP_TestUsecases.txt b/test/JPP_TestUsecases.txt
index f8b22e12..5c42a13c 100644
--- a/test/JPP_TestUsecases.txt
+++ b/test/JPP_TestUsecases.txt
@@ -352,7 +352,6 @@ Expectation: JsonPreprocessor returns expected value
 Test JPP_0504 / COMPOSITE_EXPRESSIONS / GOODCASE
 Description: JSON file with composite data structure (some dictionaries)
 Expectation: JsonPreprocessor returns expected value
-Hint.......: !!! some parts commented out; to be activated after bugfixes are available
 ------------------------------------------------------------------------------------------------------------------------
 Test JPP_0505 / COMPOSITE_EXPRESSIONS / GOODCASE
 Description: JSON file with composite strings containing several times a colon and a comma (JSON syntax elements)
@@ -392,5 +391,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: 18.07.2023 - 15:09:36
+Generated: 02.08.2023 - 14:43:07
 
diff --git a/test/component_test.py b/test/component_test.py
index 278f4378..e3857383 100644
--- a/test/component_test.py
+++ b/test/component_test.py
@@ -22,7 +22,7 @@
 #
 # --------------------------------------------------------------------------------------------------------------
 #
-# 28.07.2023
+# 02.08.2023
 #
 # --------------------------------------------------------------------------------------------------------------
 #TM***
@@ -366,7 +366,7 @@ def AnalyzeExceptions(EXPECTEDEXCEPTION=None, sException=None):
    TESTFULLNAME    = f"{TESTID}-({SECTION})-[{SUBSECTION}]"
    TESTLOGFILE_TXT = f"{TESTLOGFILESFOLDER}/{TESTFULLNAME}.log"
 
-   sOut = f"====== [TEST] : '{TESTFULLNAME}' / ({nCntUsecases}/{nNrOfUsecases})"
+   sOut = f"====== [START OF TEST] : '{TESTFULLNAME}' / ({nCntUsecases}/{nNrOfUsecases})"
    print(COLBY + sOut)
    print()
    oSelfTestLogFile.Write(sOut, 1)
diff --git a/test/testconfig/TestConfig.py b/test/testconfig/TestConfig.py
index a3035ff5..c23b7323 100644
--- a/test/testconfig/TestConfig.py
+++ b/test/testconfig/TestConfig.py
@@ -22,7 +22,7 @@
 #
 # --------------------------------------------------------------------------------------------------------------
 #
-# 27.07.2023
+# 02.08.2023
 #
 # --------------------------------------------------------------------------------------------------------------
 
@@ -2023,7 +2023,7 @@
 dictUsecase['HINT']              = None
 dictUsecase['COMMENT']           = None
 dictUsecase['JSONFILE']          = r"..\testfiles\jpp-test_config_0951.jsonp"
-dictUsecase['EXPECTEDEXCEPTION'] = "Invalid control character"
+dictUsecase['EXPECTEDEXCEPTION'] = "No closing quotation in line"
 dictUsecase['EXPECTEDRETURN']    = None
 listofdictUsecases.append(dictUsecase)
 del dictUsecase