SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix status for new sub-packages (#5278)

Browse Source
This commit is contained in:
Marc Bernard 2022-01-22 02:57:08 -05:00 committed by GitHub
parent 3eee3fc797
commit 5e3e5b60e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/objects/core/zcl_abapgit_file_status.clas.abap
View File

@ -142,7 +142,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. CLASS zcl_abapgit_file_status IMPLEMENTATION.
METHOD build_existing. METHOD build_existing.
@ -694,17 +694,17 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION.
it_items = it_items_idx it_items = it_items_idx
it_state = it_state_idx ). it_state = it_state_idx ).
" Check if same file exists in different location " Check if same file exists in different location (not for generic package files)
READ TABLE it_local ASSIGNING <ls_local> READ TABLE it_local ASSIGNING <ls_local>
WITH KEY file-filename = <ls_remote>-filename. WITH KEY file-filename = <ls_remote>-filename.
IF sy-subrc = 0. IF sy-subrc = 0 AND <ls_remote>-filename <> zcl_abapgit_filename_logic=>c_package_file.
<ls_result>-match = abap_false. <ls_result>-match = abap_false.
<ls_result>-lstate = zif_abapgit_definitions=>c_state-deleted. <ls_result>-lstate = zif_abapgit_definitions=>c_state-deleted.
<ls_result>-rstate = zif_abapgit_definitions=>c_state-unchanged. <ls_result>-rstate = zif_abapgit_definitions=>c_state-unchanged.
IF <ls_local>-file-sha1 = <ls_remote>-sha1. IF <ls_local>-file-sha1 = <ls_remote>-sha1.
<ls_result>-packmove = abap_true. <ls_result>-packmove = abap_true.
ENDIF. ENDIF.
ELSEIF sy-subrc = 4. ELSE.
" Check if file existed before and was deleted locally " Check if file existed before and was deleted locally
READ TABLE it_state_idx TRANSPORTING NO FIELDS READ TABLE it_state_idx TRANSPORTING NO FIELDS
WITH KEY path = <ls_remote>-path filename = <ls_remote>-filename WITH KEY path = <ls_remote>-path filename = <ls_remote>-filename

53
src/objects/core/zcl_abapgit_file_status.clas.testclasses.abap
View File

@ -697,8 +697,8 @@ CLASS ltcl_calculate_status DEFINITION FOR TESTING RISK LEVEL HARMLESS
local_outside_main FOR TESTING RAISING zcx_abapgit_exception, local_outside_main FOR TESTING RAISING zcx_abapgit_exception,
complete FOR TESTING RAISING zcx_abapgit_exception, complete FOR TESTING RAISING zcx_abapgit_exception,
only_local2 FOR TESTING RAISING zcx_abapgit_exception, only_local2 FOR TESTING RAISING zcx_abapgit_exception,
only_remote2 FOR TESTING RAISING zcx_abapgit_exception. only_remote2 FOR TESTING RAISING zcx_abapgit_exception,
only_remote3 FOR TESTING RAISING zcx_abapgit_exception.
ENDCLASS. ENDCLASS.
CLASS ltcl_calculate_status IMPLEMENTATION. CLASS ltcl_calculate_status IMPLEMENTATION.
@ -1163,6 +1163,7 @@ CLASS ltcl_calculate_status IMPLEMENTATION.
METHOD only_remote2. METHOD only_remote2.
" Add local class implementation
mo_helper->add_local( mo_helper->add_local(
iv_path = '/src/sub/' iv_path = '/src/sub/'
iv_obj_name = 'ZCL_CLAS' iv_obj_name = 'ZCL_CLAS'
@ -1175,7 +1176,6 @@ CLASS ltcl_calculate_status IMPLEMENTATION.
iv_filename = 'zcl_clas.clas.abap' iv_filename = 'zcl_clas.clas.abap'
iv_sha1 = '332211' ). iv_sha1 = '332211' ).
mo_helper->add_remote( mo_helper->add_remote(
iv_path = '/src/sub/' iv_path = '/src/sub/'
iv_filename = 'zcl_clas.clas.locals_imp.abap' iv_filename = 'zcl_clas.clas.locals_imp.abap'
@ -1186,7 +1186,7 @@ CLASS ltcl_calculate_status IMPLEMENTATION.
iv_filename = 'zcl_clas.clas.locals_imp.abap' iv_filename = 'zcl_clas.clas.locals_imp.abap'
iv_sha1 = '1111' ). iv_sha1 = '1111' ).
mo_result = mo_helper->run( iv_devclass = '$DIFFERENT$' ). mo_result = mo_helper->run( iv_devclass = '$DIFFERENT' ).
mo_result->assert_lines( 2 ). mo_result->assert_lines( 2 ).
@ -1196,4 +1196,49 @@ CLASS ltcl_calculate_status IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD only_remote3.
" Add subpackage remotely
mo_helper->add_local(
iv_path = '/src/'
iv_obj_name = '$DIFFERENT'
iv_obj_type = 'DEVC'
iv_filename = 'package.devc.xml'
iv_sha1 = '112233' ).
mo_helper->add_remote(
iv_path = '/src/'
iv_filename = 'package.devc.xml'
iv_sha1 = '112233' ).
mo_helper->add_remote(
iv_path = '/src/sub/'
iv_filename = 'package.devc.xml'
iv_sha1 = '332211' ).
mo_helper->add_state(
iv_path = '/src/'
iv_filename = 'package.devc.xml'
iv_sha1 = '112233' ).
mo_result = mo_helper->run( iv_devclass = '$DIFFERENT' ).
mo_result->assert_lines( 2 ).
" main package matches
cl_abap_unit_assert=>assert_equals(
act = mo_result->get_line( 1 )-match
exp = abap_true ).
" subpackage should appear as added remotely
cl_abap_unit_assert=>assert_equals(
act = mo_result->get_line( 2 )-lstate
exp = zif_abapgit_definitions=>c_state-unchanged ).
cl_abap_unit_assert=>assert_equals(
act = mo_result->get_line( 2 )-rstate
exp = zif_abapgit_definitions=>c_state-added ).
ENDMETHOD.
ENDCLASS. ENDCLASS.