From 60473f3f7a8d029191b241a4d25536369eab81be Mon Sep 17 00:00:00 2001 From: oblomov <102328295+oblomov-dev@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:33:19 +0100 Subject: [PATCH] downport readiness (#819) --- .../z2ui5_cl_util_func.clas.testclasses.abap | 23 ----------- src/10/01/z2ui5_cl_xml_view_cc.clas.abap | 37 +++++++++-------- .../z2ui5_cl_test_no_github_action.clas.abap | 41 +++++++++++++++++++ .../z2ui5_cl_test_no_github_action.clas.xml | 18 ++++++++ 4 files changed, 80 insertions(+), 39 deletions(-) create mode 100644 src/99/z2ui5_cl_test_no_github_action.clas.abap create mode 100644 src/99/z2ui5_cl_test_no_github_action.clas.xml diff --git a/src/00/z2ui5_cl_util_func.clas.testclasses.abap b/src/00/z2ui5_cl_util_func.clas.testclasses.abap index 1902c8c5..9bc106c4 100644 --- a/src/00/z2ui5_cl_util_func.clas.testclasses.abap +++ b/src/00/z2ui5_cl_util_func.clas.testclasses.abap @@ -97,7 +97,6 @@ CLASS ltcl_unit_test DEFINITION FINAL FOR TESTING METHODS test_rtti_get_t_attri_by_obj FOR TESTING RAISING cx_static_check. METHODS test_rtti_get_t_comp_by_struc FOR TESTING RAISING cx_static_check. - METHODS test_trans_json_any_2__w_tab FOR TESTING RAISING cx_static_check. METHODS test_trans_json_any_2__w_struc FOR TESTING RAISING cx_static_check. METHODS test_trans_json_2_any__w_dref FOR TESTING RAISING cx_static_check. METHODS test_trans_ref_tab_2_tab FOR TESTING RAISING cx_static_check. @@ -425,29 +424,7 @@ CLASS ltcl_unit_test IMPLEMENTATION. ENDMETHOD. - METHOD test_trans_json_any_2__w_tab. - TYPES: - BEGIN OF ty_row, - title TYPE string, - value TYPE string, - selected TYPE abap_bool, - END OF ty_row. - TYPES ty_t_tab TYPE STANDARD TABLE OF ty_row WITH EMPTY KEY. - - DATA(lt_tab) = VALUE ty_t_tab( ( title = 'Test' value = 'this is a description' selected = abap_true ) - ( title = 'Test2' value = 'this is a new descr' selected = abap_false ) ). - - - DATA(lv_tab_json) = z2ui5_cl_util_func=>trans_json_by_any( lt_tab ). - - DATA(lv_result) = `[{"TITLE":"Test","VALUE":"this is a description","SELECTED":true},{"TITLE":"Test2","VALUE":"this is a new descr"}]`. - - IF lv_result <> lv_tab_json. - cl_abap_unit_assert=>fail( ). - ENDIF. - - ENDMETHOD. METHOD test_trans_json_2_any__w_dref. diff --git a/src/10/01/z2ui5_cl_xml_view_cc.clas.abap b/src/10/01/z2ui5_cl_xml_view_cc.clas.abap index 7e69b1c1..c924aade 100644 --- a/src/10/01/z2ui5_cl_xml_view_cc.clas.abap +++ b/src/10/01/z2ui5_cl_xml_view_cc.clas.abap @@ -7,12 +7,12 @@ CLASS z2ui5_cl_xml_view_cc DEFINITION METHODS multiinput_ext IMPORTING - !MultiInputId TYPE clike OPTIONAL - !change TYPE clike OPTIONAL - !addedTokens TYPE clike OPTIONAL - !removedTokens TYPE clike OPTIONAL + !multiinputid TYPE clike OPTIONAL + !change TYPE clike OPTIONAL + !addedtokens TYPE clike OPTIONAL + !removedtokens TYPE clike OPTIONAL RETURNING - VALUE(result) TYPE REF TO z2ui5_cl_xml_view . + VALUE(result) TYPE REF TO z2ui5_cl_xml_view . METHODS multiinput IMPORTING @@ -29,14 +29,14 @@ CLASS z2ui5_cl_xml_view_cc DEFINITION !enabled TYPE clike OPTIONAL !class TYPE clike OPTIONAL !change TYPE clike OPTIONAL - !addedTokens TYPE clike OPTIONAL - !removedTokens TYPE clike OPTIONAL + !addedtokens TYPE clike OPTIONAL + !removedtokens TYPE clike OPTIONAL RETURNING VALUE(result) TYPE REF TO z2ui5_cl_xml_view . METHODS uitableext IMPORTING - !tableid TYPE clike OPTIONAL + !tableid TYPE clike OPTIONAL RETURNING VALUE(result) TYPE REF TO z2ui5_cl_xml_view . @@ -180,7 +180,7 @@ ENDCLASS. -CLASS Z2UI5_CL_XML_VIEW_CC IMPLEMENTATION. +CLASS z2ui5_cl_xml_view_cc IMPLEMENTATION. METHOD bwip_js. @@ -236,8 +236,13 @@ CLASS Z2UI5_CL_XML_VIEW_CC IMPLEMENTATION. METHOD demo_output. + "make it run without syntax error also when CC are deleted (for example for downports)) mo_view->_generic( ns = `html` name = `style` ). - result = mo_view->_cc_plain_xml( z2ui5_cl_cc_demo_output=>get_style( ) )->html( val ). + DATA lv_style TYPE string. + CALL METHOD ('Z2UI5_CL_CC_DEMO_OUTPUT')=>('GET_STYLE') + RECEIVING + result = lv_style. + result = mo_view->_cc_plain_xml( lv_style )->html( val ). ENDMETHOD. @@ -352,8 +357,8 @@ CLASS Z2UI5_CL_XML_VIEW_CC IMPLEMENTATION. ( n = `id` v = id ) ( n = `change` v = change ) ( n = `valueHelpRequest` v = valuehelprequest ) - ( n = `addedTokens` v = addedTokens ) - ( n = `removedTokens` v = removedTokens ) + ( n = `addedTokens` v = addedtokens ) + ( n = `removedTokens` v = removedtokens ) ( n = `class` v = class ) ) ). ENDMETHOD. @@ -362,10 +367,10 @@ CLASS Z2UI5_CL_XML_VIEW_CC IMPLEMENTATION. result = mo_view. mo_view->_generic( name = `MultiInputExt` ns = `z2ui5` - t_prop = VALUE #( ( n = `MultiInputId` v = MultiInputId ) + t_prop = VALUE #( ( n = `MultiInputId` v = multiinputid ) ( n = `change` v = change ) - ( n = `addedTokens` v = addedTokens ) - ( n = `removedTokens` v = removedTokens ) ) ). + ( n = `addedTokens` v = addedtokens ) + ( n = `removedTokens` v = removedtokens ) ) ). ENDMETHOD. @@ -424,7 +429,7 @@ CLASS Z2UI5_CL_XML_VIEW_CC IMPLEMENTATION. METHOD uitableext. result = mo_view->_generic( name = `UITableExt` ns = `z2ui5` - t_prop = VALUE #( ( n = `tableId` v = tableId ) + t_prop = VALUE #( ( n = `tableId` v = tableid ) ) ). ENDMETHOD. diff --git a/src/99/z2ui5_cl_test_no_github_action.clas.abap b/src/99/z2ui5_cl_test_no_github_action.clas.abap new file mode 100644 index 00000000..828830ea --- /dev/null +++ b/src/99/z2ui5_cl_test_no_github_action.clas.abap @@ -0,0 +1,41 @@ +CLASS z2ui5_cl_test_no_github_action DEFINITION + PUBLIC + FINAL + CREATE PUBLIC FOR TESTING RISK LEVEL harmless. + + PUBLIC SECTION. + + METHODS test_trans_json_any_2__w_tab FOR TESTING RAISING cx_static_check. + PROTECTED SECTION. + PRIVATE SECTION. +ENDCLASS. + + + +CLASS z2ui5_cl_test_no_github_action IMPLEMENTATION. + + METHOD test_trans_json_any_2__w_tab. + +* TYPES: +* BEGIN OF ty_row, +* title TYPE string, +* value TYPE string, +* selected TYPE abap_bool, +* END OF ty_row. +* TYPES ty_t_tab TYPE STANDARD TABLE OF ty_row WITH EMPTY KEY. +* +* DATA(lt_tab) = VALUE ty_t_tab( ( title = 'Test' value = 'this is a description' selected = abap_true ) +* ( title = 'Test2' value = 'this is a new descr' selected = abap_false ) ). +* +* +* DATA(lv_tab_json) = z2ui5_cl_util_func=>trans_json_by_any( lt_tab ). +* +* DATA(lv_result) = `[{"TITLE":"Test","VALUE":"this is a description","SELECTED":true},{"TITLE":"Test2","VALUE":"this is a new descr","SELECTED":false}]`. +* +* IF lv_result <> lv_tab_json. +* cl_abap_unit_assert=>fail( ). +* ENDIF. + + ENDMETHOD. + +ENDCLASS. diff --git a/src/99/z2ui5_cl_test_no_github_action.clas.xml b/src/99/z2ui5_cl_test_no_github_action.clas.xml new file mode 100644 index 00000000..d0f61350 --- /dev/null +++ b/src/99/z2ui5_cl_test_no_github_action.clas.xml @@ -0,0 +1,18 @@ + + + + + + Z2UI5_CL_TEST_NO_GITHUB_ACTION + E + tests abap standard only + 05 + 1 + X + X + X + 11 + + + +