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

Fix/check 02 allow old syntax 4 select option #1122

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Fix/check 02 allow old syntax 4 select option #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c87a72
fix(): Allow 'old' syntax for default value in select-option definiti…
alezhu Dec 7, 2023
f4f0496
fix(): Fix checks when option is last word in statement
alezhu Dec 7, 2023
d4c3935
Remove whitespace at end of line in src/checks/zcl_aoc_check_08.clas.…
alezhu Dec 7, 2023
8925dba
refactor(): Fix abaplint problems
alezhu Dec 7, 2023
257c7f5
Merge branch 'fix/check_02_allow_old_syntax_4_select_option' of githu…
alezhu Dec 7, 2023
9613d02
Fix in-statement indentation in src/checks/zcl_aoc_check_08.clas.abap
alezhu Dec 7, 2023
0190d88
refactor(): Fix abaplint problems
alezhu Dec 7, 2023
5f6a9a4
Remove whitespace at end of line in src/checks/zcl_aoc_check_08.clas.…
alezhu Dec 7, 2023
9b86e50
Merge branch 'main' into fix/check_02_allow_old_syntax_4_select_option
larshp Feb 26, 2024
6e18a80
Merge branch 'main' into fix/check_02_allow_old_syntax_4_select_option
alezhu Feb 27, 2024
09a7c0e
Merge branch 'fix/check_02_allow_old_syntax_4_select_option' of githu…
alezhu Feb 27, 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
108 changes: 60 additions & 48 deletions src/checks/zcl_aoc_check_08.clas.abap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,39 @@ CLASS zcl_aoc_check_08 DEFINITION

PROTECTED SECTION.

DATA mv_001 TYPE flag .
DATA mv_002 TYPE flag .
DATA mv_003 TYPE flag .
DATA mv_004 TYPE flag .
DATA mv_005 TYPE flag .
DATA mv_006 TYPE flag .
DATA mv_007 TYPE flag .
DATA mv_008 TYPE flag .
DATA mv_009 TYPE flag .
DATA mv_010 TYPE flag .
DATA mv_011 TYPE flag .
DATA mv_012 TYPE flag .
DATA mv_013 TYPE flag .
DATA mv_014 TYPE flag .
DATA mv_015 TYPE flag .
DATA mv_016 TYPE flag .
DATA mv_017 TYPE flag .
DATA mv_018 TYPE flag .
DATA mv_019 TYPE flag .
DATA mv_020 TYPE flag .
DATA mv_021 TYPE flag .
DATA mv_022 TYPE flag .
DATA mv_023 TYPE flag .
DATA mv_024 TYPE flag .
DATA mv_001 TYPE flag.
DATA mv_002 TYPE flag.
DATA mv_003 TYPE flag.
DATA mv_004 TYPE flag.
DATA mv_005 TYPE flag.
DATA mv_006 TYPE flag.
DATA mv_007 TYPE flag.
DATA mv_008 TYPE flag.
DATA mv_009 TYPE flag.
DATA mv_010 TYPE flag.
DATA mv_011 TYPE flag.
DATA mv_012 TYPE flag.
DATA mv_013 TYPE flag.
DATA mv_014 TYPE flag.
DATA mv_015 TYPE flag.
DATA mv_016 TYPE flag.
DATA mv_017 TYPE flag.
DATA mv_018 TYPE flag.
DATA mv_019 TYPE flag.
DATA mv_020 TYPE flag.
DATA mv_021 TYPE flag.
DATA mv_022 TYPE flag.
DATA mv_023 TYPE flag.
DATA mv_024 TYPE flag.

DATA mt_old_option TYPE STANDARD TABLE OF char2 WITH DEFAULT KEY.

METHODS is_old
IMPORTING
!iv_statement TYPE string
RETURNING
VALUE(rv_old) TYPE abap_bool .
VALUE(rv_old) TYPE abap_bool.
METHODS _fill_old_options.
PRIVATE SECTION.
ENDCLASS.

Expand Down Expand Up @@ -281,6 +284,8 @@ CLASS zcl_aoc_check_08 IMPLEMENTATION.
mv_023 = abap_true.
mv_024 = abap_true.

_fill_old_options( ).

ENDMETHOD.


Expand Down Expand Up @@ -356,29 +361,27 @@ CLASS zcl_aoc_check_08 IMPLEMENTATION.

rv_old = abap_false.

IF iv_statement CP '* EQ *' AND NOT iv_statement CP '* EQ TYPE *'.
rv_old = abap_true.
ENDIF.

IF iv_statement CP '* NE *' AND NOT iv_statement CP '* NE TYPE *'.
rv_old = abap_true.
ENDIF.

IF iv_statement CP '* LT *' AND NOT iv_statement CP '* LT TYPE *'.
rv_old = abap_true.
ENDIF.

IF iv_statement CP '* GT *' AND NOT iv_statement CP '* GT TYPE *'.
rv_old = abap_true.
ENDIF.

IF iv_statement CP '* LE *' AND NOT iv_statement CP '* LE TYPE *'.
rv_old = abap_true.
ENDIF.

IF iv_statement CP '* GE *' AND NOT iv_statement CP '* GE TYPE *'.
rv_old = abap_true.
ENDIF.
LOOP AT mt_old_option INTO DATA(lv_option).
DATA(lv_include) = |\\s{ lv_option }\\s|.
DATA(lv_exclude) = |(\\s{ lv_option }\\s+TYPE\\b)\|(\\sOPTION\\s+{ lv_option }\\b)|.
TRY.
DATA(lo_regex) = cl_regex_cache=>get_singleton( )->get_regex(
pattern = lv_include
ignore_case = abap_true ).
DATA(lo_match) = lo_regex->create_matcher( text = iv_statement ).
IF lo_match->find_next( ) = abap_true.
lo_regex = cl_regex_cache=>get_singleton( )->get_regex(
pattern = lv_exclude
ignore_case = abap_true ).
lo_match = lo_regex->create_matcher( text = iv_statement ).
IF lo_match->find_next( ) = abap_false.
rv_old = abap_true.
RETURN.
ENDIF.
ENDIF.
CATCH cx_sy_regex cx_sy_matcher INTO DATA(lx_ignore).
ENDTRY.
ENDLOOP.

ENDMETHOD.

Expand Down Expand Up @@ -415,4 +418,13 @@ CLASS zcl_aoc_check_08 IMPLEMENTATION.
ASSERT sy-subrc = 0.

ENDMETHOD.

METHOD _fill_old_options.
APPEND 'EQ' TO mt_old_option.
APPEND 'NE' TO mt_old_option.
APPEND 'LT' TO mt_old_option.
APPEND 'GT' TO mt_old_option.
APPEND 'LE' TO mt_old_option.
APPEND 'GE' TO mt_old_option.
ENDMETHOD.
ENDCLASS.
34 changes: 34 additions & 0 deletions src/checks/zcl_aoc_check_08.clas.testclasses.abap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ CLASS ltcl_test DEFINITION FOR TESTING
test007_02 FOR TESTING,
test007_03 FOR TESTING,
test007_04 FOR TESTING,
test007_05 FOR TESTING,
test007_06 FOR TESTING,
test007_07 FOR TESTING,
test008_01 FOR TESTING,
test009_01 FOR TESTING,
test010_01 FOR TESTING,
Expand Down Expand Up @@ -261,6 +264,37 @@ CLASS ltcl_test IMPLEMENTATION.

ENDMETHOD.

METHOD test007_05.

_code 'SELECT-OPTIONS s_date FOR d DEFAULT ''20231207'' SIGN I OPTION GE MODIF ID mr.'.

ms_result = zcl_aoc_unit_test=>check( mt_code ).

cl_abap_unit_assert=>assert_initial( ms_result ).

ENDMETHOD.

METHOD test007_06.

_code 'SELECT-OPTIONS s_date FOR d DEFAULT ''20231207'' SIGN I OPTION GE.'.

ms_result = zcl_aoc_unit_test=>check( mt_code ).

cl_abap_unit_assert=>assert_initial( ms_result ).

ENDMETHOD.

METHOD test007_07.

_code 'SELECT-OPTIONS s_date FOR d DEFAULT ''20231207'' SIGN I OPTION GE'.
_code 'MODIF ID mr.'.

ms_result = zcl_aoc_unit_test=>check( mt_code ).

cl_abap_unit_assert=>assert_initial( ms_result ).

ENDMETHOD.

METHOD test008_01.

_code 'DEMAND something.'.
Expand Down