Fix for issue #2772 (#2806)

* Update zcl_abapgit_transport_objects.clas.abap

* Update zcl_abapgit_transport_objects.clas.testclasses.abap

* Update zcl_abapgit_transport_objects.clas.testclasses.abap

* Update zcl_abapgit_transport_objects.clas.abap

* Update zcl_abapgit_transport_objects.clas.abap

* Update zcl_abapgit_transport_objects.clas.abap
This commit is contained in:
Johan Wigert 2019-07-22 06:30:17 +02:00 committed by Lars Hvam
parent 6b5fbd52fd
commit b068ddcaa3
2 changed files with 20 additions and 2 deletions

View File

@ -64,9 +64,10 @@ CLASS ZCL_ABAPGIT_TRANSPORT_OBJECTS IMPLEMENTATION.
iv_data = ls_local_file-file-data ).
ENDIF.
WHEN zif_abapgit_definitions=>c_state-deleted.
IF ls_transport_object-delflag = abap_false.
* SUSC, see https://github.com/larshp/abapGit/issues/2772
IF ls_transport_object-delflag = abap_false AND ls_transport_object-object <> 'SUSC'.
zcx_abapgit_exception=>raise( |Object { ls_transport_object-obj_name
} should be removed, but has NO deletion flag in transport| ).
} should be removed, but has NO deletion flag in transport| ).
ENDIF.
io_stage->rm(
iv_path = ls_object_status-path

View File

@ -10,6 +10,7 @@ CLASS ltcl_transport_objects DEFINITION FOR TESTING DURATION SHORT RISK LEVEL HA
cant_be_added_with_del_flag FOR TESTING RAISING cx_static_check,
cant_be_modified_with_del_flag FOR TESTING RAISING cx_static_check,
deleted_to_removed_files FOR TESTING RAISING cx_static_check,
should_remove_no_delflag FOR TESTING RAISING cx_static_check,
shouldnt_remove_no_delflag FOR TESTING RAISING cx_static_check,
should_add_all_local_files FOR TESTING RAISING cx_static_check,
should_delete_all_related FOR TESTING RAISING cx_static_check,
@ -264,6 +265,22 @@ CLASS ltcl_transport_objects IMPLEMENTATION.
iv_path = '/a_path' ).
ENDMETHOD.
METHOD should_remove_no_delflag.
given_the_transport_object(
iv_obj_name = 'ZFOO'
iv_obj_type = 'SUSC'
iv_delflag = abap_false ).
given_the_object_status(
iv_obj_name = 'ZFOO'
iv_obj_type = 'SUSC'
iv_filename = 'zfoo.susc.xml'
iv_path = '/a_path'
iv_lstate = zif_abapgit_definitions=>c_state-deleted ).
then_it_should_not_raise_excpt( ).
ENDMETHOD.
METHOD shouldnt_remove_no_delflag.
given_the_transport_object(
iv_obj_name = 'CL_FOO'