Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 79ff534

Browse files
jgebaljgebal
committed
Changed from case when then to if then as coverage reporting is not counting case statements.
1 parent 633a25f commit 79ff534

7 files changed

Lines changed: 146 additions & 123 deletions

File tree

‎source/core/types/ut_event_listener.tpb‎

Lines changed: 50 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -19,60 +19,57 @@ create or replace type body ut_event_listener is
1919
overriding member procedure fire_event(self in out nocopy ut_event_listener, a_event_timing varchar2, a_event_name varchar2, a_item ut_suite_item_base) is
2020
begin
2121
for i in 1..self.reporters.count loop
22-
case a_event_timing
23-
when 'before' then
24-
case a_event_name
25-
when ut_utils.gc_run then
26-
self.reporters(i).before_calling_run(treat(a_item as ut_run));
27-
when ut_utils.gc_suite then
28-
self.reporters(i).before_calling_suite(treat(a_item as ut_logical_suite));
29-
when ut_utils.gc_before_all then
30-
self.reporters(i).before_calling_before_all(treat(a_item as ut_logical_suite));
31-
when ut_utils.gc_before_each then
32-
self.reporters(i).before_calling_before_each(treat(a_item as ut_logical_suite));
33-
when ut_utils.gc_test then
34-
self.reporters(i).before_calling_test(treat(a_item as ut_test));
35-
when ut_utils.gc_before_test then
36-
self.reporters(i).before_calling_before_test(treat(a_item as ut_test));
37-
when ut_utils.gc_test_execute then
38-
self.reporters(i).before_calling_test_execute(treat(a_item as ut_test));
39-
when ut_utils.gc_after_test then
40-
self.reporters(i).before_calling_after_test(treat(a_item as ut_test));
41-
when ut_utils.gc_after_each then
42-
self.reporters(i).before_calling_after_each(treat(a_item as ut_logical_suite));
43-
when ut_utils.gc_after_all then
44-
self.reporters(i).before_calling_after_all(treat(a_item as ut_logical_suite));
45-
else
46-
raise_application_error(ut_utils.gc_invalid_rep_event_name,'Inavlid reporting event name - '|| nvl(a_event_name,'NULL'));
47-
end case;
48-
when 'after' then
49-
case a_event_name
50-
when ut_utils.gc_run then
51-
self.reporters(i).after_calling_run(treat(a_item as ut_run));
52-
when ut_utils.gc_suite then
53-
self.reporters(i).after_calling_suite(treat(a_item as ut_logical_suite));
54-
when ut_utils.gc_before_all then
55-
self.reporters(i).after_calling_before_all(treat(a_item as ut_logical_suite));
56-
when ut_utils.gc_before_each then
57-
self.reporters(i).after_calling_before_each(treat(a_item as ut_logical_suite));
58-
when ut_utils.gc_test then
59-
self.reporters(i).after_calling_test(treat(a_item as ut_test));
60-
when ut_utils.gc_before_test then
61-
self.reporters(i).after_calling_before_test(treat(a_item as ut_test));
62-
when ut_utils.gc_test_execute then
63-
self.reporters(i).after_calling_test_execute(treat(a_item as ut_test));
64-
when ut_utils.gc_after_test then
65-
self.reporters(i).after_calling_after_test(treat(a_item as ut_test));
66-
when ut_utils.gc_after_each then
67-
self.reporters(i).after_calling_after_each(treat(a_item as ut_logical_suite));
68-
when ut_utils.gc_after_all then
69-
self.reporters(i).after_calling_after_all(treat(a_item as ut_logical_suite));
70-
else
71-
raise_application_error(ut_utils.gc_invalid_rep_event_name,'Inavlid reporting event name - '|| nvl(a_event_name,'NULL'));
72-
end case;
22+
if a_event_timing = 'before' then
23+
if a_event_name = ut_utils.gc_run then
24+
self.reporters(i).before_calling_run(treat(a_item as ut_run));
25+
elsif a_event_name = ut_utils.gc_suite then
26+
self.reporters(i).before_calling_suite(treat(a_item as ut_logical_suite));
27+
elsif a_event_name = ut_utils.gc_before_all then
28+
self.reporters(i).before_calling_before_all(treat(a_item as ut_logical_suite));
29+
elsif a_event_name = ut_utils.gc_before_each then
30+
self.reporters(i).before_calling_before_each(treat(a_item as ut_logical_suite));
31+
elsif a_event_name = ut_utils.gc_test then
32+
self.reporters(i).before_calling_test(treat(a_item as ut_test));
33+
elsif a_event_name = ut_utils.gc_before_test then
34+
self.reporters(i).before_calling_before_test(treat(a_item as ut_test));
35+
elsif a_event_name = ut_utils.gc_test_execute then
36+
self.reporters(i).before_calling_test_execute(treat(a_item as ut_test));
37+
elsif a_event_name = ut_utils.gc_after_test then
38+
self.reporters(i).before_calling_after_test(treat(a_item as ut_test));
39+
elsif a_event_name = ut_utils.gc_after_each then
40+
self.reporters(i).before_calling_after_each(treat(a_item as ut_logical_suite));
41+
elsif a_event_name = ut_utils.gc_after_all then
42+
self.reporters(i).before_calling_after_all(treat(a_item as ut_logical_suite));
7343
else
74-
raise_application_error(ut_utils.gc_invalid_rep_event_time,'Inavlid reporting event time - '|| nvl(a_event_timing,'NULL'));
75-
end case;
44+
raise_application_error(ut_utils.gc_invalid_rep_event_name,'Inavlid reporting event name - '|| nvl(a_event_name,'NULL'));
45+
end if;
46+
elsif a_event_timing = 'after' then
47+
if a_event_name = ut_utils.gc_run then
48+
self.reporters(i).after_calling_run(treat(a_item as ut_run));
49+
elsif a_event_name = ut_utils.gc_suite then
50+
self.reporters(i).after_calling_suite(treat(a_item as ut_logical_suite));
51+
elsif a_event_name = ut_utils.gc_before_all then
52+
self.reporters(i).after_calling_before_all(treat(a_item as ut_logical_suite));
53+
elsif a_event_name = ut_utils.gc_before_each then
54+
self.reporters(i).after_calling_before_each(treat(a_item as ut_logical_suite));
55+
elsif a_event_name = ut_utils.gc_test then
56+
self.reporters(i).after_calling_test(treat(a_item as ut_test));
57+
elsif a_event_name = ut_utils.gc_before_test then
58+
self.reporters(i).after_calling_before_test(treat(a_item as ut_test));
59+
elsif a_event_name = ut_utils.gc_test_execute then
60+
self.reporters(i).after_calling_test_execute(treat(a_item as ut_test));
61+
elsif a_event_name = ut_utils.gc_after_test then
62+
self.reporters(i).after_calling_after_test(treat(a_item as ut_test));
63+
elsif a_event_name = ut_utils.gc_after_each then
64+
self.reporters(i).after_calling_after_each(treat(a_item as ut_logical_suite));
65+
elsif a_event_name = ut_utils.gc_after_all then
66+
self.reporters(i).after_calling_after_all(treat(a_item as ut_logical_suite));
67+
else
68+
raise_application_error(ut_utils.gc_invalid_rep_event_name,'Inavlid reporting event name - '|| nvl(a_event_name,'NULL'));
69+
end if;
70+
else
71+
raise_application_error(ut_utils.gc_invalid_rep_event_time,'Inavlid reporting event time - '|| nvl(a_event_timing,'NULL'));
72+
end if;
7673
end loop;
7774

7875
end;

‎source/core/types/ut_results_counter.tpb‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,20 @@ create or replace type body ut_results_counter as
3131
end;
3232

3333
member function result_status return integer is
34+
l_result integer;
3435
begin
35-
return
36-
case
37-
when self.errored_count > 0 then ut_utils.tr_error
38-
when self.failure_count > 0 then ut_utils.tr_failure
39-
when self.success_count > 0 then ut_utils.tr_success
40-
when self.ignored_count > 0 then ut_utils.tr_ignore
41-
else ut_utils.tr_error
42-
end;
36+
if self.errored_count > 0 then
37+
l_result := ut_utils.tr_error;
38+
elsif self.failure_count > 0 then
39+
l_result := ut_utils.tr_failure;
40+
elsif self.success_count > 0 then
41+
l_result := ut_utils.tr_success;
42+
elsif self.ignored_count > 0 then
43+
l_result := ut_utils.tr_ignore;
44+
else
45+
l_result := ut_utils.tr_error;
46+
end if;
47+
return l_result;
4348
end;
4449

4550
end;

‎source/core/ut_utils.pkb‎

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,32 @@ create or replace package body ut_utils is
66
end;
77

88
function test_result_to_char(a_test_result integer) return varchar2 as
9+
l_result varchar2(20);
910
begin
10-
return case a_test_result
11-
when tr_success then tr_success_char
12-
when tr_failure then tr_failure_char
13-
when tr_error then tr_error_char
14-
when tr_ignore then tr_ignore_char
15-
else 'Unknown(' || coalesce(to_char(a_test_result),'NULL') || ')'
16-
end;
11+
if a_test_result = tr_success then
12+
l_result := tr_success_char;
13+
elsif a_test_result = tr_failure then
14+
l_result := tr_failure_char;
15+
elsif a_test_result = tr_error then
16+
l_result := tr_error_char;
17+
elsif a_test_result = tr_ignore then
18+
l_result := tr_ignore_char;
19+
else
20+
l_result := 'Unknown(' || coalesce(to_char(a_test_result),'NULL') || ')';
21+
end if ;
22+
return l_result;
1723
end test_result_to_char;
1824

1925

2026
function to_test_result(a_test boolean) return integer is
27+
l_result integer;
2128
begin
22-
return case a_test
23-
when true then tr_success
24-
else tr_failure
25-
end;
29+
if a_test then
30+
l_result := tr_success;
31+
else
32+
l_result := tr_failure;
33+
end if;
34+
return l_result;
2635
end;
2736

2837
function gen_savepoint_name return varchar2 is
@@ -50,7 +59,7 @@ create or replace package body ut_utils is
5059
null;
5160
$end
5261
end;
53-
62+
5463
procedure debug_log(a_message clob) is
5564
l_varchars ut_varchar2_list;
5665
begin
@@ -66,35 +75,44 @@ create or replace package body ut_utils is
6675

6776
function to_string(a_value varchar2) return varchar2 is
6877
l_len integer := coalesce(length(a_value),0);
78+
l_result varchar2(32767);
6979
begin
70-
return
71-
case
72-
when l_len = 0 then gc_null_string
73-
when l_len <= gc_max_input_string_length then quote_string(a_value)
74-
else quote_string(substr(a_value,1,gc_overflow_substr_len)) || gc_more_data_string
75-
end;
80+
if l_len = 0 then
81+
l_result := gc_null_string;
82+
elsif l_len <= gc_max_input_string_length then
83+
l_result := quote_string(a_value);
84+
else
85+
l_result := quote_string(substr(a_value,1,gc_overflow_substr_len)) || gc_more_data_string;
86+
end if ;
87+
return l_result;
7688
end;
7789

7890
function to_string(a_value clob) return varchar2 is
7991
l_len integer := coalesce(dbms_lob.getlength(a_value), 0);
92+
l_result varchar2(32767);
8093
begin
81-
return
82-
case
83-
when l_len = 0 then gc_null_string
84-
when l_len <= gc_max_input_string_length then quote_string(a_value)
85-
else quote_string(dbms_lob.substr(a_value, gc_overflow_substr_len)) || gc_more_data_string
86-
end;
94+
if l_len = 0 then
95+
l_result := gc_null_string;
96+
elsif l_len <= gc_max_input_string_length then
97+
l_result := quote_string(a_value);
98+
else
99+
l_result := quote_string(dbms_lob.substr(a_value, gc_overflow_substr_len)) || gc_more_data_string;
100+
end if;
101+
return l_result;
87102
end;
88103

89104
function to_string(a_value blob) return varchar2 is
90105
l_len integer := coalesce(dbms_lob.getlength(a_value), 0);
106+
l_result varchar2(32767);
91107
begin
92-
return
93-
case
94-
when l_len = 0 then gc_null_string
95-
when l_len <= gc_max_input_string_length then quote_string(rawtohex(a_value))
96-
else to_string( rawtohex(dbms_lob.substr(a_value, gc_overflow_substr_len)) )
97-
end;
108+
if l_len = 0 then
109+
l_result := gc_null_string;
110+
elsif l_len <= gc_max_input_string_length then
111+
l_result := quote_string(rawtohex(a_value));
112+
else
113+
l_result := to_string( rawtohex(dbms_lob.substr(a_value, gc_overflow_substr_len)) );
114+
end if ;
115+
return l_result;
98116
end;
99117

100118
function to_string(a_value boolean) return varchar2 is

‎source/expectations/matchers/ut_be_false.tpb‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ create or replace type body ut_be_false as
77
end;
88

99
overriding member function run_matcher(self in out nocopy ut_be_false, a_actual ut_data_value) return boolean is
10+
l_result boolean;
1011
begin
11-
return
12-
case
13-
when a_actual is of (ut_data_value_boolean)
14-
then not ut_utils.int_to_boolean(treat(a_actual as ut_data_value_boolean).data_value)
15-
else (self as ut_matcher).run_matcher(a_actual)
16-
end;
12+
if a_actual is of (ut_data_value_boolean) then
13+
l_result := not ut_utils.int_to_boolean(treat(a_actual as ut_data_value_boolean).data_value);
14+
else
15+
l_result := (self as ut_matcher).run_matcher(a_actual);
16+
end if;
17+
return l_result;
1718
end;
1819

1920
end;

‎source/expectations/matchers/ut_be_like.tpb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ create or replace type body ut_be_like as
1515
end;
1616

1717
overriding member function run_matcher(self in out nocopy ut_be_like, a_actual ut_data_value) return boolean is
18-
l_value clob;
18+
l_value clob;
19+
l_result boolean;
1920
begin
2021
if a_actual is of (ut_data_value_varchar2) then
2122
l_value := treat(a_actual as ut_data_value_varchar2).data_value;
2223
elsif a_actual is of (ut_data_value_clob) then
2324
l_value := treat(a_actual as ut_data_value_clob).data_value;
2425
end if;
2526

26-
return
27-
case
28-
when a_actual is of (ut_data_value_varchar2, ut_data_value_clob)
29-
then
30-
case
31-
when escape_char is not null
32-
then l_value like mask escape escape_char
33-
else l_value like mask
34-
end
35-
else (self as ut_matcher).run_matcher(a_actual)
36-
end;
27+
if a_actual is of (ut_data_value_varchar2, ut_data_value_clob) then
28+
if escape_char is not null then
29+
l_result := l_value like mask escape escape_char;
30+
else
31+
l_result := l_value like mask;
32+
end if;
33+
else
34+
l_result := (self as ut_matcher).run_matcher(a_actual);
35+
end if;
36+
return l_result;
3737
end;
3838

3939
end;

‎source/expectations/matchers/ut_be_true.tpb‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ create or replace type body ut_be_true as
77
end;
88

99
overriding member function run_matcher(self in out nocopy ut_be_true, a_actual ut_data_value) return boolean is
10+
l_result boolean;
1011
begin
11-
return
12-
case
13-
when a_actual is of (ut_data_value_boolean)
14-
then ut_utils.int_to_boolean( treat(a_actual as ut_data_value_boolean).data_value)
15-
else (self as ut_matcher).run_matcher(a_actual)
16-
end;
12+
if a_actual is of (ut_data_value_boolean) then
13+
l_result := ut_utils.int_to_boolean( treat(a_actual as ut_data_value_boolean).data_value);
14+
else
15+
l_result := (self as ut_matcher).run_matcher(a_actual);
16+
end if;
17+
return l_result;
1718
end;
1819

1920
end;

‎source/expectations/matchers/ut_match.tpb‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ create or replace type body ut_match as
1515
end;
1616

1717
overriding member function run_matcher(self in out nocopy ut_match, a_actual ut_data_value) return boolean is
18+
l_result boolean;
1819
begin
19-
return
20-
case
21-
when a_actual is of (ut_data_value_varchar2)
22-
then regexp_like(treat(a_actual as ut_data_value_varchar2).data_value, pattern, modifiers)
23-
when a_actual is of (ut_data_value_clob)
24-
then regexp_like(treat(a_actual as ut_data_value_clob).data_value, pattern, modifiers)
25-
else (self as ut_matcher).run_matcher(a_actual)
26-
end;
20+
if a_actual is of (ut_data_value_varchar2) then
21+
l_result := regexp_like(treat(a_actual as ut_data_value_varchar2).data_value, pattern, modifiers);
22+
elsif a_actual is of (ut_data_value_clob) then
23+
l_result := regexp_like(treat(a_actual as ut_data_value_clob).data_value, pattern, modifiers);
24+
else
25+
l_result := (self as ut_matcher).run_matcher(a_actual);
26+
end if;
27+
return l_result;
2728
end;
2829

2930
end;

0 commit comments

Comments
 (0)