Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namsonx/task/stabi branch #360

Merged
merged 29 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7e987bc
Enhancement 289 - Side effects of token string usage
namsonx Aug 29, 2024
e3b0d2b
Merge branch 'develop' into namsonx/task/stabi_branch
namsonx Aug 29, 2024
0d4005d
Enhancement 260 - Check absolute path when overwriting param
namsonx Sep 1, 2024
fa748af
Documentation 217 - Update the description of a parameter in the cons…
namsonx Sep 4, 2024
bffc164
Enhancement 289 - Initialize variable indexList before using.
namsonx Sep 9, 2024
25153ae
Enhancement 217 - Fixed the issue related to current config update
namsonx Sep 9, 2024
f7640b5
Enhancement 345 - Improved implicit creation feature
namsonx Sep 24, 2024
6a0bbf6
Updated error message of implicit creation feature.
namsonx Oct 7, 2024
0edb725
Enhancement 206 - Fix urgent issue of parameter name check
namsonx Oct 17, 2024
52b3e83
Ticket 343 - Fixed issue naming convention check failed
namsonx Oct 18, 2024
5afd4ff
Ticket 342 - Handle error message for jsonLoads method.
namsonx Oct 18, 2024
da3fd76
Ticket 345 - Updated error message
namsonx Oct 18, 2024
8db800d
tmp backup
HolQue Oct 18, 2024
f15796b
Ticket 345 - Updated error message based on review comment.
namsonx Oct 21, 2024
05a2e8d
Merge branch 'namsonx/task/stabi_branch' into HolQue/task/selftest_ma…
HolQue Oct 22, 2024
84026a6
deleted unwanted batch file
HolQue Oct 22, 2024
cd2ac95
Self test partially reworked (to be continued)
HolQue Oct 22, 2024
5f24feb
Merge pull request #348 from test-fullautomation/HolQue/task/selftest…
test-fullautomation Oct 22, 2024
fcb55db
Ticket 206 - Updated param name check for utf-8 cases
namsonx Oct 23, 2024
f7190c2
Added 'PARAMETER_SCOPE' self tests
HolQue Oct 23, 2024
3d7d9d8
Ticket 345 - Fix bug while improving implicit creation feature.
namsonx Oct 24, 2024
d893c49
Ticket 345 - Tiny change to fix the issue of enhancement 345
namsonx Oct 24, 2024
3c1077f
Merge pull request #351 from test-fullautomation/HolQue/task/selftest…
test-fullautomation Oct 24, 2024
a9ab4f2
Ticket 345 - Fixed bug related to improving implicit creation
namsonx Oct 24, 2024
e134252
Added self test case JPP_0400
HolQue Oct 25, 2024
fe58975
Adapted file headers
HolQue Oct 25, 2024
50be6d8
Update history and version
namsonx Oct 28, 2024
bbf7461
Merge pull request #359 from test-fullautomation/HolQue/task/selftest…
namsonx Oct 28, 2024
1bc2c92
Correct release information
namsonx Oct 28, 2024
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
249 changes: 151 additions & 98 deletions JsonPreprocessor/CJsonPreprocessor.py

Large diffs are not rendered by default.

Binary file modified JsonPreprocessor/JsonPreprocessor.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions JsonPreprocessor/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
#
# Version and date of JsonPreprocessor
#
VERSION = "0.8.0"
VERSION_DATE = "12.08.2024"
VERSION = "0.8.1"
VERSION_DATE = "28.10.2024"

3 changes: 1 addition & 2 deletions atest/testdata/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,7 @@
"testcase_06a": "JsonPreprocessor",
"testcase_06b": {
"globalFloatParam": 97,
"gCheck01": 12,
"globalIntParam": 69
"gCheck01": 12
},
"testcase_06c": 23,
"testcase_06d": {
Expand Down
17 changes: 16 additions & 1 deletion config/robotframework_aio/release_items_JsonPreprocessor.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"
]
,
"0.12.1.;0.13.0." : [
"0.12.1.;0.13.0.;0.13.1." : [
"
* Changed data type of return value

Expand Down Expand Up @@ -145,6 +145,21 @@
Valid key names are: ``\"abcParam\"``, ``\"01_Param\"``, ``\"__param+1\"``, ``\"param-1\"``, ``\"[email protected]\"``, ...

Invalid key names are: ``\"+param01\"``, ``\"param$01\"``, ``\"abc#Param\"``, ...

* Checked absolute path when overwriting parameter

When overwriting a parameter, the absolute path of the parameter must be provided

**Example:**

|``\u007b``
| ``\"params\" : \u007b\"001\" : \u007b\"002\" : \u007b``
| ``\"param\" : 1,``
| ``$\u007bparams.001.002.param\u007d : 2``
| ``\u007d``
| ``\u007d``
| ``\u007d``
|``\u007d``
"
]
}
Expand Down
6 changes: 6 additions & 0 deletions packagedoc/additional_docs/History.tex
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,10 @@
- Fixed issues related to error handling deviation\newline
- Updated error messages log}

\historyversiondate{0.8.1}{10/2024}
\historychange{- Fixed issues related to the naming convention check for key name\newline
- Improved implicit creation feature\newline
- Prevented side effects of token string in error messages log\newline
- Checked absolute path when overwriting parameter}

\end{packagehistory}
69 changes: 42 additions & 27 deletions test/JPP_TestUsecases.csv
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,35 @@ JPP_0101|DATA_INTEGRITY|GOODCASE|JSON file with string containing several separa
JPP_0102|DATA_INTEGRITY|GOODCASE|JSON file with string containing more special characters, masked special characters and escape sequences
JPP_0103|DATA_INTEGRITY|GOODCASE|JSON file with strings containing several pairs of square brackets (that must not cause syntax issues!)
JPP_0200|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / string parameter substitution in parameter value
JPP_0201|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / string parameter substitution in parameter name
JPP_0202|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter name / standard notation
JPP_0203|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation
JPP_0204|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation
JPP_0205|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation
JPP_0206|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter name / standard notation
JPP_0207|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation
JPP_0208|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation
JPP_0209|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation
JPP_0201|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation
JPP_0202|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation
JPP_0203|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation
JPP_0204|PARAMETER_SUBSTITUTION|GOODCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation
JPP_0250|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / string parameter substitution in parameter value / innermost parameter not existing
JPP_0251|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / string parameter substitution in parameter name / in between parameter not existing
JPP_0252|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter name / standard notation / index parameter not existing
JPP_0253|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter name / dotdict notation / index parameter not existing
JPP_0254|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing
JPP_0255|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing
JPP_0256|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter name / standard notation / variant number not existing
JPP_0257|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter name / dotdict notation / milestone number not existing
JPP_0258|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing
JPP_0259|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing
JPP_0260|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (1)
JPP_0261|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in parameter name (composite data types not allowed in names) / (2)
JPP_0262|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (1)
JPP_0263|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in parameter name (composite data types not allowed in names) / (2)
JPP_0264|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in key name (composite data types not allowed in names) / (1)
JPP_0265|PARAMETER_SUBSTITUTION|BADCASE|JSON file with list parameter substitution in key name (composite data types not allowed in names) / (2)
JPP_0266|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (1)
JPP_0267|PARAMETER_SUBSTITUTION|BADCASE|JSON file with dictionary parameter substitution in key name (composite data types not allowed in names) / (2)
JPP_0270|PARAMETER_SUBSTITUTION|BADCASE|JSON file containing a list; list index is defined by a parameter and wrapped in single quotes
JPP_0251|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / standard notation / index parameter not existing
JPP_0252|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / index parameter substitution in parameter value / dotdict notation / index parameter not existing
JPP_0253|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / standard notation / variant number not existing
JPP_0254|PARAMETER_SUBSTITUTION|BADCASE|JSON file with nested parameter / key parameter substitution in parameter value / dotdict notation / milestone number not existing
JPP_0255|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (1)
JPP_0256|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (2)
JPP_0257|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (3)
JPP_0258|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (4)
JPP_0259|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (5)
JPP_0260|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (6)
JPP_0261|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (7)
JPP_0262|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (8)
JPP_0263|PARAMETER_SUBSTITUTION|BADCASE|JSON file with substitution of blocked data types inside string values (9)
JPP_0264|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (1)
JPP_0265|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (2)
JPP_0266|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (3)
JPP_0267|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (4)
JPP_0268|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (5)
JPP_0269|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (6)
JPP_0270|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (7)
JPP_0271|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (8)
JPP_0272|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (9)
JPP_0273|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (10)
JPP_0274|PARAMETER_SUBSTITUTION|BADCASE|JSON file with blocked dynamic key names (11)
JPP_0300|VALUE_DETECTION|GOODCASE|JSON file with parameter of type 'list' / index (in square brackets) defined outside the curly brackets (valid syntax)
JPP_0301|VALUE_DETECTION|GOODCASE|JSON file with expression containing more closing elements '}' than opening elements '${' (valid syntax)
JPP_0302|VALUE_DETECTION|GOODCASE|JSON file with expression starting with '${' and ending with '}' / no further matching '${' and '}' in between (valid syntax)
Expand Down Expand Up @@ -65,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)
Expand Down Expand Up @@ -149,3 +151,16 @@ JPP_1700|LINE_BREAKS|GOODCASE|JSON file with and without line breaks inside expr
JPP_1800|SELF_ASSIGNMENTS|GOODCASE|JSON file with self assignments of strings, lists and dictionaries
JPP_1900|ASSIGNMENTS_BY_REFERENCE|GOODCASE|JSON file with dictionary assignments (by reference)
JPP_1901|ASSIGNMENTS_BY_REFERENCE|GOODCASE|JSON file with list assignments (by reference)
JPP_2000|PARAMETER_SCOPE|GOODCASE|JSON file with nested dictionary, in which a parameter is overwritten (1)
JPP_2001|PARAMETER_SCOPE|GOODCASE|JSON file with nested dictionary, in which a parameter is overwritten (2)
JPP_2002|PARAMETER_SCOPE|GOODCASE|JSON file with nested dictionary, in which a parameter is overwritten (3)
JPP_2003|PARAMETER_SCOPE|GOODCASE|JSON file with nested dictionary, in which a parameter is overwritten (4)
JPP_2007|PARAMETER_SCOPE|GOODCASE|JSON file with nested dictionary, in which a parameter is overwritten (8)
JPP_2500|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (1)
JPP_2501|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (2)
JPP_2502|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (3)
JPP_2503|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (4)
JPP_2504|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (5)
JPP_2506|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (7)
JPP_2507|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (8)
JPP_2508|PARAMETER_SCOPE|BADCASE|JSON file containing a parameter with missing scope (9)
Loading
Loading