Remove alias - asset manager (#6149)

Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
Marc Bernard 2023-03-15 09:28:10 +01:00 committed by GitHub
parent b3c4cecf39
commit b52e82da87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 69 additions and 61 deletions

View File

@ -4,8 +4,9 @@ CLASS zcl_abapgit_gui_asset_manager DEFINITION PUBLIC FINAL CREATE PUBLIC .
INTERFACES zif_abapgit_gui_asset_manager.
ALIASES:
register_asset FOR zif_abapgit_gui_asset_manager~register_asset.
CLASS-METHODS create
RETURNING
VALUE(ro_asset_manager) TYPE REF TO zcl_abapgit_gui_asset_manager.
PROTECTED SECTION.
PRIVATE SECTION.
@ -40,7 +41,12 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_GUI_ASSET_MANAGER IMPLEMENTATION.
CLASS zcl_abapgit_gui_asset_manager IMPLEMENTATION.
METHOD create.
CREATE OBJECT ro_asset_manager.
ENDMETHOD.
METHOD get_mime_asset.

View File

@ -17,17 +17,17 @@ CLASS ltcl_abapgit_gui_asset_manager IMPLEMENTATION.
METHOD get_inline_asset.
DATA lo_assetman TYPE REF TO zcl_abapgit_gui_asset_manager.
DATA li_assetman TYPE REF TO zif_abapgit_gui_asset_manager.
DATA ls_asset TYPE zif_abapgit_gui_asset_manager=>ty_web_asset.
CREATE OBJECT lo_assetman.
li_assetman = zcl_abapgit_gui_asset_manager=>create( ).
lo_assetman->register_asset(
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_inline = 'ABC' ).
ls_asset = lo_assetman->zif_abapgit_gui_asset_manager~get_asset( 'css/common.css' ).
ls_asset = li_assetman->get_asset( 'css/common.css' ).
cl_abap_unit_assert=>assert_equals( act = ls_asset-type
exp = 'text' ).
@ -41,26 +41,27 @@ CLASS ltcl_abapgit_gui_asset_manager IMPLEMENTATION.
METHOD get_text_asset.
DATA lo_assetman TYPE REF TO zcl_abapgit_gui_asset_manager.
CREATE OBJECT lo_assetman.
DATA li_assetman TYPE REF TO zif_abapgit_gui_asset_manager.
lo_assetman->register_asset(
li_assetman = zcl_abapgit_gui_asset_manager=>create( ).
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_inline = 'ABC' ).
cl_abap_unit_assert=>assert_equals(
act = lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset( 'css/common.css' )
act = li_assetman->get_text_asset( 'css/common.css' )
exp = 'ABC' ).
cl_abap_unit_assert=>assert_equals(
act = lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset(
act = li_assetman->get_text_asset(
iv_url = 'css/common.css'
iv_assert_subtype = 'css' )
exp = 'ABC' ).
TRY.
lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset(
li_assetman->get_text_asset(
iv_url = 'css/common.css'
iv_assert_subtype = 'xyz' ).
cl_abap_unit_assert=>fail( ).
@ -68,13 +69,13 @@ CLASS ltcl_abapgit_gui_asset_manager IMPLEMENTATION.
" no futher check
ENDTRY.
lo_assetman->register_asset(
li_assetman->register_asset(
iv_url = 'css/common.xyz'
iv_type = 'nottext/bin'
iv_inline = 'XYZ' ).
TRY.
lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset( 'css/common.xyz' ).
li_assetman->get_text_asset( 'css/common.xyz' ).
cl_abap_unit_assert=>fail( ).
CATCH zcx_abapgit_exception.
" no futher check
@ -84,78 +85,82 @@ CLASS ltcl_abapgit_gui_asset_manager IMPLEMENTATION.
METHOD get_mime_asset.
DATA lo_assetman TYPE REF TO zcl_abapgit_gui_asset_manager.
CREATE OBJECT lo_assetman.
DATA li_assetman TYPE REF TO zif_abapgit_gui_asset_manager.
lo_assetman->register_asset(
li_assetman = zcl_abapgit_gui_asset_manager=>create( ).
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_mime_name = 'ZABAPGIT_CSS_COMMON' ).
cl_abap_unit_assert=>assert_char_cp(
act = lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset( 'css/common.css' )
act = li_assetman->get_text_asset( 'css/common.css' )
exp = '*ABAPGIT COMMON CSS*' ).
ENDMETHOD.
METHOD get_base64_asset.
DATA lo_assetman TYPE REF TO zcl_abapgit_gui_asset_manager.
CREATE OBJECT lo_assetman.
DATA li_assetman TYPE REF TO zif_abapgit_gui_asset_manager.
lo_assetman->register_asset(
li_assetman = zcl_abapgit_gui_asset_manager=>create( ).
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_base64 = 'QEE=' ).
cl_abap_unit_assert=>assert_equals(
act = lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset( 'css/common.css' )
act = li_assetman->get_text_asset( 'css/common.css' )
exp = '@A' ).
ENDMETHOD.
METHOD get_all.
DATA lo_assetman TYPE REF TO zcl_abapgit_gui_asset_manager.
CREATE OBJECT lo_assetman.
DATA li_assetman TYPE REF TO zif_abapgit_gui_asset_manager.
lo_assetman->register_asset(
li_assetman = zcl_abapgit_gui_asset_manager=>create( ).
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_base64 = 'QEE=' ).
lo_assetman->register_asset(
li_assetman->register_asset(
iv_url = 'css/common2.css'
iv_type = 'text/css'
iv_inline = 'ABC' ).
cl_abap_unit_assert=>assert_equals(
act = lines( lo_assetman->zif_abapgit_gui_asset_manager~get_all_assets( ) )
act = lines( li_assetman->get_all_assets( ) )
exp = 2 ).
ENDMETHOD.
METHOD register_and_overwrite.
DATA lo_assetman TYPE REF TO zcl_abapgit_gui_asset_manager.
CREATE OBJECT lo_assetman.
DATA li_assetman TYPE REF TO zif_abapgit_gui_asset_manager.
lo_assetman->register_asset(
li_assetman = zcl_abapgit_gui_asset_manager=>create( ).
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_inline = 'XYZ' ).
lo_assetman->register_asset(
li_assetman->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_inline = 'ABC' ).
cl_abap_unit_assert=>assert_equals(
act = lines( lo_assetman->zif_abapgit_gui_asset_manager~get_all_assets( ) )
act = lines( li_assetman->get_all_assets( ) )
exp = 1 ).
cl_abap_unit_assert=>assert_equals(
act = lo_assetman->zif_abapgit_gui_asset_manager~get_text_asset( 'css/common.css' )
act = li_assetman->get_text_asset( 'css/common.css' )
exp = 'ABC' ).
ENDMETHOD.

View File

@ -6,28 +6,23 @@ CLASS ltcl_test_base DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT A
iv_content TYPE string OPTIONAL
RAISING zcx_abapgit_exception.
DATA:
mo_asset_manager TYPE REF TO zcl_abapgit_gui_asset_manager,
mi_asset_manager TYPE REF TO zif_abapgit_gui_asset_manager,
mo_cut TYPE REF TO zcl_abapgit_gui_css_processor.
PRIVATE SECTION.
METHODS:
setup,
teardown.
setup.
ENDCLASS.
CLASS ltcl_test_base IMPLEMENTATION.
METHOD setup.
CREATE OBJECT mo_asset_manager.
mi_asset_manager = zcl_abapgit_gui_asset_manager=>create( ).
CREATE OBJECT mo_cut
EXPORTING
ii_asset_manager = mo_asset_manager.
ENDMETHOD.
METHOD teardown.
FREE: mo_cut, mo_asset_manager.
ii_asset_manager = mi_asset_manager.
ENDMETHOD.
METHOD add_file.
mo_asset_manager->register_asset(
mi_asset_manager->register_asset(
iv_url = iv_url
iv_type = 'text/css'
iv_inline = iv_content ).

View File

@ -77,22 +77,23 @@ CLASS ltcl_html_processor_test IMPLEMENTATION.
METHOD setup.
DATA lo_asset_man TYPE REF TO zcl_abapgit_gui_asset_manager.
DATA li_asset_man TYPE REF TO zif_abapgit_gui_asset_manager.
CREATE OBJECT lo_asset_man.
lo_asset_man->register_asset( iv_url = 'css/style1.css'
li_asset_man = zcl_abapgit_gui_asset_manager=>create( ).
li_asset_man->register_asset( iv_url = 'css/style1.css'
iv_type = 'text/css'
iv_inline = 'dummy1' ).
lo_asset_man->register_asset( iv_url = 'css/style2.css'
li_asset_man->register_asset( iv_url = 'css/style2.css'
iv_type = 'text/css'
iv_inline = 'dummy2' ).
lo_asset_man->register_asset( iv_url = 'css/style3.css'
li_asset_man->register_asset( iv_url = 'css/style3.css'
iv_type = 'text/css'
iv_inline = 'dummy3' ).
CREATE OBJECT mo_cut
EXPORTING
ii_asset_man = lo_asset_man.
ii_asset_man = li_asset_man.
CREATE OBJECT mo_gui_mock.

View File

@ -48,26 +48,27 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION.
CLASS zcl_abapgit_ui_factory IMPLEMENTATION.
METHOD get_asset_manager.
DATA lo_buf TYPE REF TO zcl_abapgit_string_buffer.
DATA lo_asset_man TYPE REF TO zcl_abapgit_gui_asset_manager.
DATA li_asset_man TYPE REF TO zif_abapgit_gui_asset_manager.
CREATE OBJECT lo_buf.
CREATE OBJECT lo_asset_man.
li_asset_man = zcl_abapgit_gui_asset_manager=>create( ).
" @@abapmerge include zabapgit_css_common.w3mi.data.css > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'css/common.css'
iv_type = 'text/css'
iv_mime_name = 'ZABAPGIT_CSS_COMMON'
iv_inline = lo_buf->join_w_newline_and_flush( ) ).
" @@abapmerge include zabapgit_css_theme_default.w3mi.data.css > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'css/theme-default.css'
iv_type = 'text/css'
iv_cachable = abap_false
@ -75,7 +76,7 @@ CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION.
iv_inline = lo_buf->join_w_newline_and_flush( ) ).
" @@abapmerge include zabapgit_css_theme_dark.w3mi.data.css > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'css/theme-dark.css'
iv_type = 'text/css'
iv_cachable = abap_false
@ -83,7 +84,7 @@ CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION.
iv_inline = lo_buf->join_w_newline_and_flush( ) ).
" @@abapmerge include zabapgit_css_theme_belize_blue.w3mi.data.css > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'css/theme-belize-blue.css'
iv_type = 'text/css'
iv_cachable = abap_false
@ -91,27 +92,27 @@ CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION.
iv_inline = lo_buf->join_w_newline_and_flush( ) ).
" @@abapmerge include zabapgit_js_common.w3mi.data.js > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'js/common.js'
iv_type = 'text/javascript'
iv_mime_name = 'ZABAPGIT_JS_COMMON'
iv_inline = lo_buf->join_w_newline_and_flush( ) ).
" @@abapmerge include zabapgit_icon_font_css.w3mi.data.css > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'css/ag-icons.css'
iv_type = 'text/css'
iv_mime_name = 'ZABAPGIT_ICON_FONT_CSS'
iv_inline = lo_buf->join_w_newline_and_flush( ) ).
" @@abapmerge include-base64 zabapgit_icon_font.w3mi.data.woff > lo_buf->add( '$$' ).
lo_asset_man->register_asset(
li_asset_man->register_asset(
iv_url = 'font/ag-icons.woff'
iv_type = 'font/woff'
iv_mime_name = 'ZABAPGIT_ICON_FONT'
iv_base64 = lo_buf->join_and_flush( ) ).
ri_asset_man = lo_asset_man.
ri_asset_man = li_asset_man.
ENDMETHOD.