Skip to content

Commit eb7084d

Browse files
NeumannJoergNeumannJoerg
authored
Merge pull request #36 from SchwarzIT/34-unit-tests-remove-handling-of-unexpected-exceptions
Issue #34 - Fixed abaplint findings
2 parents c10e083 + 90cdc86 commit eb7084d

File tree

3 files changed

+75
-92
lines changed

3 files changed

+75
-92
lines changed

‎src/#usi#bal_cust_evaluation/#usi#cl_bal_ce_retention.clas.testclasses.abap‎

Lines changed: 64 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ CLASS lcl_unit_tests DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS DURATION S
8989
METHODS test_generic_sub_object FOR TESTING.
9090
METHODS test_perfect_match FOR TESTING.
9191

92-
METHODS get_non_fallback_retention_par
92+
METHODS get_non_fallback_result
9393
IMPORTING
9494
i_offset_days TYPE int2
9595
RETURNING
@@ -118,7 +118,7 @@ CLASS lcl_unit_tests IMPLEMENTATION.
118118
METHOD test_no_match_for_log_object.
119119
test_double_cust_dao->insert_mock_data_line( VALUE #( log_object = 'CUST_LOG_OBJECT'
120120
log_level = /usi/cl_bal_enum_log_level=>additional_info
121-
retention_params = get_non_fallback_retention_par( 10 ) ) ).
121+
retention_params = get_non_fallback_result( 10 ) ) ).
122122

123123
assert_cut_returns_expected( i_log_object = 'NOT_IN_CUST'
124124
i_expected_result = cut->get_fallback( ) ).
@@ -127,106 +127,102 @@ CLASS lcl_unit_tests IMPLEMENTATION.
127127
METHOD test_no_match_for_sub_object.
128128
test_double_cust_dao->insert_mock_data_line( VALUE #( sub_object = 'CUST_SUB_OBJECT'
129129
log_level = /usi/cl_bal_enum_log_level=>additional_info
130-
retention_params = get_non_fallback_retention_par( 20 ) ) ).
130+
retention_params = get_non_fallback_result( 20 ) ) ).
131131

132132
assert_cut_returns_expected( i_log_object = space
133133
i_sub_object = 'NOT_IN_CUST'
134134
i_expected_result = cut->get_fallback( ) ).
135135
ENDMETHOD.
136136

137137
METHOD test_full_generic_matches_all.
138-
DATA(expected_result) = get_non_fallback_retention_par( 4 ).
139-
140-
test_double_cust_dao->insert_mock_data_lines(
141-
i_new_lines = VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
142-
( log_object = space
143-
sub_object = space
144-
retention_params = expected_result )
145-
( log_object = space
146-
sub_object = 'CUST_SUB_OBJECT'
147-
retention_params = get_non_fallback_retention_par( 3 ) )
148-
( log_object = 'CUST_LOG_OBJECT'
149-
sub_object = space
150-
retention_params = get_non_fallback_retention_par( 2 ) )
151-
( log_object = 'CUST_LOG_OBJECT'
152-
sub_object = 'CUST_SUB_OBJECT'
153-
retention_params = get_non_fallback_retention_par( 1 ) ) ) ).
138+
DATA(expected_result) = get_non_fallback_result( 4 ).
139+
140+
test_double_cust_dao->insert_mock_data_lines( VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
141+
( log_object = space
142+
sub_object = space
143+
retention_params = expected_result )
144+
( log_object = space
145+
sub_object = 'CUST_SUB_OBJECT'
146+
retention_params = get_non_fallback_result( 3 ) )
147+
( log_object = 'CUST_LOG_OBJECT'
148+
sub_object = space
149+
retention_params = get_non_fallback_result( 2 ) )
150+
( log_object = 'CUST_LOG_OBJECT'
151+
sub_object = 'CUST_SUB_OBJECT'
152+
retention_params = get_non_fallback_result( 1 ) ) ) ).
154153

155154
assert_cut_returns_expected( i_log_object = 'NOT_IN_CUST'
156155
i_sub_object = 'NOT_IN_CUST'
157156
i_expected_result = expected_result ).
158157
ENDMETHOD.
159158

160159
METHOD test_generic_log_object.
161-
DATA(expected_result) = get_non_fallback_retention_par( 3 ).
162-
163-
test_double_cust_dao->insert_mock_data_lines(
164-
i_new_lines = VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
165-
( log_object = space
166-
sub_object = space
167-
retention_params = get_non_fallback_retention_par( 4 ) )
168-
( log_object = space
169-
sub_object = 'CUST_SUB_OBJECT'
170-
retention_params = expected_result )
171-
( log_object = 'CUST_LOG_OBJECT'
172-
sub_object = space
173-
retention_params = get_non_fallback_retention_par( 2 ) )
174-
( log_object = 'CUST_LOG_OBJECT'
175-
sub_object = 'CUST_SUB_OBJECT'
176-
retention_params = get_non_fallback_retention_par( 1 ) ) ) ).
160+
DATA(expected_result) = get_non_fallback_result( 3 ).
161+
162+
test_double_cust_dao->insert_mock_data_lines( VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
163+
( log_object = space
164+
sub_object = space
165+
retention_params = get_non_fallback_result( 4 ) )
166+
( log_object = space
167+
sub_object = 'CUST_SUB_OBJECT'
168+
retention_params = expected_result )
169+
( log_object = 'CUST_LOG_OBJECT'
170+
sub_object = space
171+
retention_params = get_non_fallback_result( 2 ) )
172+
( log_object = 'CUST_LOG_OBJECT'
173+
sub_object = 'CUST_SUB_OBJECT'
174+
retention_params = get_non_fallback_result( 1 ) ) ) ).
177175

178176
assert_cut_returns_expected( i_log_object = 'NOT_IN_CUST'
179177
i_sub_object = 'CUST_SUB_OBJECT'
180178
i_expected_result = expected_result ).
181179
ENDMETHOD.
182180

183181
METHOD test_generic_sub_object.
184-
DATA(expected_result) = get_non_fallback_retention_par( 2 ).
185-
186-
test_double_cust_dao->insert_mock_data_lines(
187-
i_new_lines = VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
188-
( log_object = space
189-
sub_object = space
190-
retention_params = get_non_fallback_retention_par( 4 ) )
191-
( log_object = space
192-
sub_object = 'CUST_SUB_OBJECT'
193-
retention_params = get_non_fallback_retention_par( 3 ) )
194-
( log_object = 'CUST_LOG_OBJECT'
195-
sub_object = space
196-
retention_params = expected_result )
197-
( log_object = 'CUST_LOG_OBJECT'
198-
sub_object = 'CUST_SUB_OBJECT'
199-
retention_params = get_non_fallback_retention_par( 1 ) ) ) ).
182+
DATA(expected_result) = get_non_fallback_result( 2 ).
183+
184+
test_double_cust_dao->insert_mock_data_lines( VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
185+
( log_object = space
186+
sub_object = space
187+
retention_params = get_non_fallback_result( 4 ) )
188+
( log_object = space
189+
sub_object = 'CUST_SUB_OBJECT'
190+
retention_params = get_non_fallback_result( 3 ) )
191+
( log_object = 'CUST_LOG_OBJECT'
192+
sub_object = space
193+
retention_params = expected_result )
194+
( log_object = 'CUST_LOG_OBJECT'
195+
sub_object = 'CUST_SUB_OBJECT'
196+
retention_params = get_non_fallback_result( 1 ) ) ) ).
200197

201198
assert_cut_returns_expected( i_log_object = 'CUST_LOG_OBJECT'
202199
i_sub_object = 'NOT_IN_CUST'
203200
i_expected_result = expected_result ).
204201
ENDMETHOD.
205202

206203
METHOD test_perfect_match.
207-
DATA(expected_result) = get_non_fallback_retention_par( 1 ).
208-
209-
test_double_cust_dao->insert_mock_data_lines(
210-
i_new_lines = VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
211-
( log_object = space
212-
sub_object = space
213-
retention_params = get_non_fallback_retention_par( 4 ) )
214-
( log_object = space
215-
sub_object = 'CUST_SUB_OBJECT'
216-
retention_params = get_non_fallback_retention_par( 3 ) )
217-
( log_object = 'CUST_LOG_OBJECT'
218-
sub_object = space
219-
retention_params = get_non_fallback_retention_par( 2 ) )
220-
( log_object = 'CUST_LOG_OBJECT'
221-
sub_object = 'CUST_SUB_OBJECT'
222-
retention_params = expected_result ) ) ).
204+
DATA(expected_result) = get_non_fallback_result( 1 ).
205+
206+
test_double_cust_dao->insert_mock_data_lines( VALUE #( log_level = /usi/cl_bal_enum_log_level=>additional_info
207+
( log_object = space
208+
sub_object = space
209+
retention_params = get_non_fallback_result( 4 ) )
210+
( log_object = space
211+
sub_object = 'CUST_SUB_OBJECT'
212+
retention_params = get_non_fallback_result( 3 ) )
213+
( log_object = 'CUST_LOG_OBJECT'
214+
sub_object = space
215+
retention_params = get_non_fallback_result( 2 ) )
216+
( log_object = 'CUST_LOG_OBJECT'
217+
sub_object = 'CUST_SUB_OBJECT'
218+
retention_params = expected_result ) ) ).
223219

224220
assert_cut_returns_expected( i_log_object = 'CUST_LOG_OBJECT'
225221
i_sub_object = 'CUST_SUB_OBJECT'
226222
i_expected_result = expected_result ).
227223
ENDMETHOD.
228224

229-
METHOD get_non_fallback_retention_par.
225+
METHOD get_non_fallback_result.
230226
r_result = cut->get_fallback( ).
231227

232228
TRY.

‎src/#usi#bal_cust_evaluation/#usi#cl_bal_cust_eval_factory.clas.abap‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,48 +25,36 @@ ENDCLASS.
2525

2626
CLASS /usi/cl_bal_cust_eval_factory IMPLEMENTATION.
2727
METHOD /usi/if_bal_cust_eval_factory~get_data_containers.
28-
DATA dao TYPE REF TO /usi/if_bal_cd_data_containers.
29-
30-
dao = dao_factory->get_data_containers( ).
31-
r_result = NEW /usi/cl_bal_ce_data_containers( i_customizing_dao = dao ).
28+
DATA(dao) = dao_factory->get_data_containers( ).
29+
r_result = NEW /usi/cl_bal_ce_data_containers( dao ).
3230
ENDMETHOD.
3331

3432
METHOD /usi/if_bal_cust_eval_factory~get_exception_mapper.
35-
DATA dao TYPE REF TO /usi/if_bal_cd_cx_mapper.
36-
3733
IF exception_mapper IS NOT BOUND.
38-
dao = dao_factory->get_exception_mapper( ).
34+
DATA(dao) = dao_factory->get_exception_mapper( ).
3935
exception_mapper = NEW /usi/cl_bal_ce_cx_mapper( i_customizing_dao = dao ).
4036
ENDIF.
4137

4238
r_result = exception_mapper.
4339
ENDMETHOD.
4440

4541
METHOD /usi/if_bal_cust_eval_factory~get_log_level_by_client.
46-
DATA dao TYPE REF TO /usi/if_bal_cd_log_lv_by_clnt.
47-
48-
dao = dao_factory->get_log_level_by_client( ).
42+
DATA(dao) = dao_factory->get_log_level_by_client( ).
4943
r_result = NEW /usi/cl_bal_ce_log_lv_by_clnt( i_customizing_dao = dao ).
5044
ENDMETHOD.
5145

5246
METHOD /usi/if_bal_cust_eval_factory~get_log_level_by_log_object.
53-
DATA dao TYPE REF TO /usi/if_bal_cd_log_lv_by_obj.
54-
55-
dao = dao_factory->get_log_level_by_log_object( ).
47+
DATA(dao) = dao_factory->get_log_level_by_log_object( ).
5648
r_result = NEW /usi/cl_bal_ce_log_lv_by_obj( i_customizing_dao = dao ).
5749
ENDMETHOD.
5850

5951
METHOD /usi/if_bal_cust_eval_factory~get_log_level_by_user.
60-
DATA dao TYPE REF TO /usi/if_bal_cd_log_lv_by_user.
61-
62-
dao = dao_factory->get_log_level_by_user( ).
52+
DATA(dao) = dao_factory->get_log_level_by_user( ).
6353
r_result = NEW /usi/cl_bal_ce_log_lv_by_user( i_customizing_dao = dao ).
6454
ENDMETHOD.
6555

6656
METHOD /usi/if_bal_cust_eval_factory~get_retention_parameters.
67-
DATA dao TYPE REF TO /usi/if_bal_cd_retention.
68-
69-
dao = dao_factory->get_retention_parameters( ).
57+
DATA(dao) = dao_factory->get_retention_parameters( ).
7058
r_result = NEW /usi/cl_bal_ce_retention( i_customizing_dao = dao ).
7159
ENDMETHOD.
7260

@@ -75,10 +63,8 @@ CLASS /usi/cl_bal_cust_eval_factory IMPLEMENTATION.
7563
ENDMETHOD.
7664

7765
METHOD get_instance.
78-
DATA dao_factory TYPE REF TO /usi/if_bal_cust_dao_factory.
79-
8066
IF instance IS NOT BOUND.
81-
dao_factory = NEW /usi/cl_bal_cust_dao_factory( ).
67+
DATA(dao_factory) = NEW /usi/cl_bal_cust_dao_factory( ).
8268
instance = NEW /usi/cl_bal_cust_eval_factory( i_dao_factory = dao_factory ).
8369
ENDIF.
8470

‎src/#usi#bal_data_containers/#usi#cl_bal_dc_retcode_and_msg.clas.testclasses.abap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ CLASS lcl_unit_tests_serialization IMPLEMENTATION.
4040
DATA(serialized_data_container) = NEW /usi/cl_bal_dc_retcode_and_msg(
4141
i_message = input-message
4242
i_return_code = input-return_code )->/usi/if_bal_data_container~serialize( ).
43-
DATA(cut) = CAST /usi/cl_bal_dc_retcode_and_msg( /usi/cl_bal_dc_retcode_and_msg=>/usi/if_bal_data_container~deserialize(
44-
serialized_data_container ) ).
43+
DATA(cut) = CAST /usi/cl_bal_dc_retcode_and_msg(
44+
/usi/cl_bal_dc_retcode_and_msg=>/usi/if_bal_data_container~deserialize(
45+
serialized_data_container ) ).
4546

4647
" Compare
4748
cl_abap_unit_assert=>assert_equals( exp = input-message

0 commit comments

Comments
 (0)