Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified JsonPreprocessor/JsonPreprocessor.pdf
Binary file not shown.
3 changes: 2 additions & 1 deletion packagedoc/additional_docs/The JSONP format.tex
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,11 @@ \section{Naming convention}
All key names in JSONP files must adhere to the following rules:

\begin{itemize}
\item Key names can only consist of letters, digits and the following special characters: \pcode{_ + - * / \\}
\item Key names can only consist of letters, digits and the following special characters: \pcode{_ + - * / \\\\ @}
(\textit{backslashes are allowed but have to be masked}).
\item Key names have to start with a letter, a digit or an underscore.
\item Key names must not be empty strings. But leading and trailing blanks will be removed (and therefore do not cause errors).
Also blanks in between allowed characters are not allowed.
\end{itemize}

% --------------------------------------------------------------------------------------------------------------
Expand Down
14 changes: 7 additions & 7 deletions test/JPP_TestUsecases.html
Original file line number Diff line number Diff line change
Expand Up @@ -2291,7 +2291,7 @@
<td colspan="1" valign="center" bgcolor="#F5F5F5" align="left">
<font size="2" face="Arial" color="#595959"><i>
<b>JSON file with several invalid parameter names (1)</b><br>
Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception


</i></font></td>
Expand Down Expand Up @@ -2324,7 +2324,7 @@
<td colspan="1" valign="center" bgcolor="#F5F5F5" align="left">
<font size="2" face="Arial" color="#595959"><i>
<b>JSON file with several invalid parameter names (2)</b><br>
Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception


</i></font></td>
Expand Down Expand Up @@ -2357,7 +2357,7 @@
<td colspan="1" valign="center" bgcolor="#F5F5F5" align="left">
<font size="2" face="Arial" color="#595959"><i>
<b>JSON file with several invalid parameter names (3)</b><br>
Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception


</i></font></td>
Expand Down Expand Up @@ -2390,7 +2390,7 @@
<td colspan="1" valign="center" bgcolor="#F5F5F5" align="left">
<font size="2" face="Arial" color="#595959"><i>
<b>JSON file with several invalid parameter names (4)</b><br>
Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception


</i></font></td>
Expand Down Expand Up @@ -2423,7 +2423,7 @@
<td colspan="1" valign="center" bgcolor="#F5F5F5" align="left">
<font size="2" face="Arial" color="#595959"><i>
<b>JSON file with several invalid parameter names (5)</b><br>
Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception


</i></font></td>
Expand Down Expand Up @@ -2456,7 +2456,7 @@
<td colspan="1" valign="center" bgcolor="#F5F5F5" align="left">
<font size="2" face="Arial" color="#595959"><i>
<b>JSON file with several invalid parameter names (6)</b><br>
Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception


</i></font></td>
Expand Down Expand Up @@ -6742,7 +6742,7 @@
</tbody></table></div>
<div>&nbsp;</div>
<hr width="100%" color="#FF8C00" align="center">
<div align="center"><font size="2" color="#27408B">Generated: 03.01.2025 - 16:19:20</font></div>
<div align="center"><font size="2" color="#27408B">Generated: 09.01.2025 - 18:56:30</font></div>
<div>&nbsp;</div>
</body></html>

14 changes: 7 additions & 7 deletions test/JPP_TestUsecases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ Test Use Cases

**JSON file with several invalid parameter names (1)**

Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception

----

Expand All @@ -755,7 +755,7 @@ Test Use Cases

**JSON file with several invalid parameter names (2)**

Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception

----

Expand All @@ -765,7 +765,7 @@ Test Use Cases

**JSON file with several invalid parameter names (3)**

Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception

----

Expand All @@ -775,7 +775,7 @@ Test Use Cases

**JSON file with several invalid parameter names (4)**

Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception

----

Expand All @@ -785,7 +785,7 @@ Test Use Cases

**JSON file with several invalid parameter names (5)**

Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception

----

Expand All @@ -795,7 +795,7 @@ Test Use Cases

**JSON file with several invalid parameter names (6)**

Expected: All names are accepted (in definition and in reference)
Expected: Expected: No values are returned, and JsonPreprocessor throws an exception

----

Expand Down Expand Up @@ -2125,5 +2125,5 @@ Test Use Cases

----

Generated: 03.01.2025 - 16:19:20
Generated: 09.01.2025 - 18:56:30

14 changes: 7 additions & 7 deletions test/JPP_TestUsecases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -312,27 +312,27 @@ Expectation: All names are accepted (in definition and in reference)
------------------------------------------------------------------------------------------------------------------------
Test JPP_0450 / NAMING_CONVENTION / BADCASE
Description: JSON file with several invalid parameter names (1)
Expectation: All names are accepted (in definition and in reference)
Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception
------------------------------------------------------------------------------------------------------------------------
Test JPP_0451 / NAMING_CONVENTION / BADCASE
Description: JSON file with several invalid parameter names (2)
Expectation: All names are accepted (in definition and in reference)
Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception
------------------------------------------------------------------------------------------------------------------------
Test JPP_0452 / NAMING_CONVENTION / BADCASE
Description: JSON file with several invalid parameter names (3)
Expectation: All names are accepted (in definition and in reference)
Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception
------------------------------------------------------------------------------------------------------------------------
Test JPP_0453 / NAMING_CONVENTION / BADCASE
Description: JSON file with several invalid parameter names (4)
Expectation: All names are accepted (in definition and in reference)
Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception
------------------------------------------------------------------------------------------------------------------------
Test JPP_0454 / NAMING_CONVENTION / BADCASE
Description: JSON file with several invalid parameter names (5)
Expectation: All names are accepted (in definition and in reference)
Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception
------------------------------------------------------------------------------------------------------------------------
Test JPP_0455 / NAMING_CONVENTION / BADCASE
Description: JSON file with several invalid parameter names (6)
Expectation: All names are accepted (in definition and in reference)
Expectation: Expected: No values are returned, and JsonPreprocessor throws an exception
------------------------------------------------------------------------------------------------------------------------
Test JPP_0500 / COMPOSITE_EXPRESSIONS / GOODCASE
Description: JSON file with composite data structure (nested lists and dictionaries 1)
Expand Down Expand Up @@ -868,5 +868,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: 03.01.2025 - 16:19:20
Generated: 09.01.2025 - 18:56:30

4 changes: 2 additions & 2 deletions test/component_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#
# --------------------------------------------------------------------------------------------------------------
#
VERSION = "0.56.0"
VERSION_DATE = "03.01.2025"
VERSION = "0.57.0"
VERSION_DATE = "09.01.2025"
#
# --------------------------------------------------------------------------------------------------------------
#TM***
Expand Down
14 changes: 7 additions & 7 deletions test/pytest/pytestfiles/test_08_NAMING_CONVENTION_BADCASE.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
# XC-HWP/ESW3-Queckenstedt
#
# 28.10.2024 - 20:15:13
# 09.01.2025 - 18:56:30
#
# --------------------------------------------------------------------------------------------------------------

Expand All @@ -30,47 +30,47 @@
class Test_NAMING_CONVENTION_BADCASE:

# --------------------------------------------------------------------------------------------------------------
# Expected: All names are accepted (in definition and in reference)
# Expected: Expected: No values are returned, and JsonPreprocessor throws an exception
@pytest.mark.parametrize(
"Description", ["JSON file with several invalid parameter names (1)",]
)
def test_JPP_0450(self, Description):
nReturn = CExecute.Execute("JPP_0450")
assert nReturn == 0
# --------------------------------------------------------------------------------------------------------------
# Expected: All names are accepted (in definition and in reference)
# Expected: Expected: No values are returned, and JsonPreprocessor throws an exception
@pytest.mark.parametrize(
"Description", ["JSON file with several invalid parameter names (2)",]
)
def test_JPP_0451(self, Description):
nReturn = CExecute.Execute("JPP_0451")
assert nReturn == 0
# --------------------------------------------------------------------------------------------------------------
# Expected: All names are accepted (in definition and in reference)
# Expected: Expected: No values are returned, and JsonPreprocessor throws an exception
@pytest.mark.parametrize(
"Description", ["JSON file with several invalid parameter names (3)",]
)
def test_JPP_0452(self, Description):
nReturn = CExecute.Execute("JPP_0452")
assert nReturn == 0
# --------------------------------------------------------------------------------------------------------------
# Expected: All names are accepted (in definition and in reference)
# Expected: Expected: No values are returned, and JsonPreprocessor throws an exception
@pytest.mark.parametrize(
"Description", ["JSON file with several invalid parameter names (4)",]
)
def test_JPP_0453(self, Description):
nReturn = CExecute.Execute("JPP_0453")
assert nReturn == 0
# --------------------------------------------------------------------------------------------------------------
# Expected: All names are accepted (in definition and in reference)
# Expected: Expected: No values are returned, and JsonPreprocessor throws an exception
@pytest.mark.parametrize(
"Description", ["JSON file with several invalid parameter names (5)",]
)
def test_JPP_0454(self, Description):
nReturn = CExecute.Execute("JPP_0454")
assert nReturn == 0
# --------------------------------------------------------------------------------------------------------------
# Expected: All names are accepted (in definition and in reference)
# Expected: Expected: No values are returned, and JsonPreprocessor throws an exception
@pytest.mark.parametrize(
"Description", ["JSON file with several invalid parameter names (6)",]
)
Expand Down
Loading