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.

Sign up for GitHub

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

Special characters (also nodes containing /) #193

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Special characters (also nodes containing /) #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f16084
Special characters (also nodes containing `/`)
mbtools Dec 6, 2024
9359794
Exclude tests from 7bit_ascii rule
mbtools Dec 18, 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
4 changes: 3 additions & 1 deletion abaplint.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
"names_no_dash": true,
"no_aliases": false,
"no_chained_assignment": true,
"7bit_ascii": true,
"7bit_ascii": {
"exclude": ["zcl_ajson.clas.testclasses.abap"]
},
"abapdoc": false,
"allowed_object_naming": true,
"allowed_object_types": true,
Expand Down
8 changes: 6 additions & 2 deletions src/core/zcl_ajson.clas.locals_imp.abap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,8 +466,12 @@ class lcl_json_parser implementation.

get reference of <item> into lr_stack_top.
insert lr_stack_top into mt_stack index 1.
" add path component
mv_stack_path = mv_stack_path && <item>-name && '/'.
" add path component (avoid issues with names containing slashes)
mv_stack_path = mv_stack_path && replace(
val = <item>-name
sub = '/'
with = cl_abap_char_utilities=>horizontal_tab )
&& '/'.

when if_sxml_node=>co_nt_element_close.
data lo_close type ref to if_sxml_close_element.
Expand Down
77 changes: 77 additions & 0 deletions src/core/zcl_ajson.clas.testclasses.abap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ class ltcl_parser_test definition final
methods parse_input_error for testing raising zcx_ajson_error.
methods duplicate_key for testing raising zcx_ajson_error.
methods non_json for testing raising zcx_ajson_error.
methods special_characters_in_name for testing raising zcx_ajson_error.
methods special_characters_in_path for testing raising zcx_ajson_error.
methods special_characters_in_value for testing raising zcx_ajson_error.

endclass.

Expand Down Expand Up @@ -515,6 +518,79 @@ class ltcl_parser_test implementation.

endmethod.

method special_characters_in_name.
mo_nodes->add( | \| \|object \| \| \|6| ).
mo_nodes->add( |/ \|a\\backslash \|num \|1 \| \|0| ).
mo_nodes->add( |/ \|contains/slash \|num \|2 \| \|0| ).
mo_nodes->add( |/ \|unicodeሴ \|num \|3 \| \|0| ).
mo_nodes->add( |/ \|quoted"text" \|num \|4 \| \|0| ).
mo_nodes->add( |/ \|line\nfeed \|num \|5 \| \|0| ).
mo_nodes->add( |/ \|with\ttab \|num \|6 \| \|0| ).

data lt_act type zif_ajson_types=>ty_nodes_tt.
data lv_str type string.

lv_str = '{ "a\\backslash": 1, "contains/slash": 2, "unicode\u1234": 3,'
&& ' "quoted\"text\"": 4, "line\nfeed": 5, "with\ttab": 6 }'.
lt_act = mo_cut->parse( lv_str ).

cl_abap_unit_assert=>assert_equals(
act = lt_act
exp = mo_nodes->mt_nodes ).

endmethod.

method special_characters_in_path.
mo_nodes->add( | \| \|object \| \| \|6| ).
mo_nodes->add( |/ \|a\\backslash \|object \| \| \|1| ).
mo_nodes->add( |/a\\backslash/ \|a \|num \|1 \| \|0| ).
mo_nodes->add( |/ \|contains/slash \|object \| \| \|1| ).
mo_nodes->add( |/contains\tslash/\|b \|num \|2 \| \|0| ). " tab!
mo_nodes->add( |/ \|unicodeሴ \|object \| \| \|1| ).
mo_nodes->add( |/unicodeሴ/ \|c \|num \|3 \| \|0| ).
mo_nodes->add( |/ \|quoted"text" \|object \| \| \|1| ).
mo_nodes->add( |/quoted"text"/ \|d \|num \|4 \| \|0| ).
mo_nodes->add( |/ \|line\nfeed \|object \| \| \|1| ).
mo_nodes->add( |/line\nfeed/ \|e \|num \|5 \| \|0| ).
mo_nodes->add( |/ \|with\ttab \|object \| \| \|1| ).
mo_nodes->add( |/with\ttab/ \|f \|num \|6 \| \|0| ).

data lt_act type zif_ajson_types=>ty_nodes_tt.
data lv_str type string.

lv_str = '{ "a\\backslash": { "a": 1 }, "contains/slash": { "b": 2 },'
&& ' "unicode\u1234": { "c": 3 }, "quoted\"text\"": { "d": 4 },'
&& ' "line\nfeed": { "e": 5 }, "with\ttab": { "f": 6 } }'.
lt_act = mo_cut->parse( lv_str ).

cl_abap_unit_assert=>assert_equals(
act = lt_act
exp = mo_nodes->mt_nodes ).

endmethod.

method special_characters_in_value.
mo_nodes->add( | \| \|object \| \| \|6| ).
mo_nodes->add( |/ \|a \|str \|a\\backslash \| \|0| ).
mo_nodes->add( |/ \|b \|str \|contains/slash \| \|0| ).
mo_nodes->add( |/ \|c \|str \|unicodeሴ \| \|0| ).
mo_nodes->add( |/ \|d \|str \|quoted"text" \| \|0| ).
mo_nodes->add( |/ \|e \|str \|line\nfeed \| \|0| ).
mo_nodes->add( |/ \|f \|str \|with\ttab \| \|0| ).

data lt_act type zif_ajson_types=>ty_nodes_tt.
data lv_str type string.

lv_str = '{ "a": "a\\backslash", "b": "contains/slash", "c": "unicode\u1234",'
&& ' "d": "quoted\"text\"", "e": "line\nfeed", "f": "with\ttab" }'.
lt_act = mo_cut->parse( lv_str ).

cl_abap_unit_assert=>assert_equals(
act = lt_act
exp = mo_nodes->mt_nodes ).

endmethod.

endclass.

**********************************************************************
Expand Down Expand Up @@ -699,6 +775,7 @@ class ltcl_serializer_test implementation.
iv_indent = 2 ).
lv_exp = sample_json( ).


cl_abap_unit_assert=>assert_equals(
act = lv_act
exp = lv_exp ).
Expand Down
Loading