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

Skip to content

Commit e926425

Browse files
PazusPazus
committed
fix for invalid package v2
1 parent 0303361 commit e926425

9 files changed

Lines changed: 63 additions & 67 deletions

File tree

‎source/core/types/ut_logical_suite.tpb‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,35 @@ create or replace type body ut_logical_suite as
3636
self.items(self.items.last) := a_item;
3737
end;
3838

39-
overriding member procedure do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) is
40-
l_completed_without_errors boolean;
41-
begin
42-
l_completed_without_errors := self.do_execute(a_listener);
43-
end;
44-
4539
overriding member function do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) return boolean is
4640
l_suite_savepoint varchar2(30);
4741
l_item_savepoint varchar2(30);
4842
l_completed_without_errors boolean;
4943
begin
5044
ut_utils.debug_log('ut_logical_suite.execute');
45+
46+
a_listener.fire_before_event(ut_utils.gc_suite,self);
47+
self.start_time := current_timestamp;
5148

5249
if self.get_ignore_flag() then
5350
self.result := ut_utils.tr_ignore;
51+
self.end_time := self.start_time;
5452
ut_utils.debug_log('ut_logical_suite.execute - ignored');
5553
else
56-
a_listener.fire_before_event(ut_utils.gc_suite,self);
5754

5855
self.start_time := current_timestamp;
5956

6057
for i in 1 .. self.items.count loop
6158
-- execute the item (test or suite)
6259
self.items(i).do_execute(a_listener);
63-
6460
end loop;
6561

6662
self.calc_execution_result();
67-
6863
self.end_time := current_timestamp;
6964

70-
a_listener.fire_after_event(ut_utils.gc_suite,self);
7165
end if;
66+
67+
a_listener.fire_after_event(ut_utils.gc_suite,self);
7268

7369
return l_completed_without_errors;
7470
end;

‎source/core/types/ut_logical_suite.tps‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ create or replace type ut_logical_suite force under ut_suite_item (
1515
member function item_index(a_name varchar2) return pls_integer,
1616
member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item),
1717
overriding member function do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) return boolean,
18-
overriding member procedure do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base),
1918
overriding member procedure calc_execution_result(self in out nocopy ut_logical_suite)
2019
) not final
2120
/

‎source/core/types/ut_run.tpb‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ create or replace type body ut_run as
88
return;
99
end;
1010

11-
overriding member procedure do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) is
12-
l_completed_without_errors boolean;
13-
begin
14-
l_completed_without_errors := self.do_execute(a_listener);
15-
end;
16-
1711
overriding member function do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) return boolean is
1812
l_completed_without_errors boolean;
1913
begin

‎source/core/types/ut_run.tps‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ create or replace type ut_run authid current_user under ut_suite_item (
55
items ut_suite_items,
66
constructor function ut_run( self in out nocopy ut_run, a_items ut_suite_items ) return self as result,
77
overriding member function do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) return boolean,
8-
overriding member procedure do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base),
98
overriding member procedure calc_execution_result(self in out nocopy ut_run)
109
)
1110
/

‎source/core/types/ut_suite.tpb‎

Lines changed: 50 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -33,61 +33,70 @@ create or replace type body ut_suite as
3333
l_completed_without_errors boolean;
3434
begin
3535
ut_utils.debug_log('ut_suite .execute');
36+
a_listener.fire_before_event(ut_utils.gc_suite,self);
37+
38+
self.start_time := current_timestamp;
3639

3740
if self.get_ignore_flag() then
3841
self.result := ut_utils.tr_ignore;
42+
self.end_time := self.start_time;
3943
ut_utils.debug_log('ut_suite .execute - ignored');
4044
else
41-
a_listener.fire_before_event(ut_utils.gc_suite,self);
42-
43-
self.start_time := current_timestamp;
44-
45-
l_suite_savepoint := self.create_savepoint_if_needed();
46-
47-
--includes listener calls for before and after actions
48-
l_completed_without_errors := self.before_all.do_execute(self, a_listener);
49-
50-
if l_completed_without_errors then
51-
for i in 1 .. self.items.count loop
52-
l_completed_without_errors := true;
53-
54-
--savepoint
55-
l_item_savepoint := self.items(i).create_savepoint_if_needed();
56-
--before each
57-
if l_completed_without_errors then
58-
--includes listener calls for before and after actions
59-
l_completed_without_errors := self.before_each.do_execute(self, a_listener);
60-
end if;
61-
62-
-- execute the item (test or suite)
63-
if l_completed_without_errors then
45+
46+
if self.is_valid() then
47+
48+
l_suite_savepoint := self.create_savepoint_if_needed();
49+
50+
--includes listener calls for before and after actions
51+
l_completed_without_errors := self.before_all.do_execute(self, a_listener);
52+
53+
if l_completed_without_errors then
54+
for i in 1 .. self.items.count loop
55+
l_completed_without_errors := true;
56+
57+
--savepoint
58+
l_item_savepoint := self.items(i).create_savepoint_if_needed();
59+
--before each
60+
if l_completed_without_errors then
61+
--includes listener calls for before and after actions
62+
l_completed_without_errors := self.before_each.do_execute(self, a_listener);
63+
end if;
64+
65+
-- execute the item (test or suite)
66+
if l_completed_without_errors then
67+
l_completed_without_errors := self.items(i).do_execute(a_listener);
68+
end if;
69+
70+
--after each
71+
if l_completed_without_errors then
72+
--includes listener calls for before and after actions
73+
l_completed_without_errors := self.after_each.do_execute(self, a_listener);
74+
end if;
75+
--rollback to savepoint
76+
self.items(i).rollback_to_savepoint(l_item_savepoint);
77+
78+
-- exit when not l_completed_without_errors;
79+
end loop;
80+
end if;
81+
82+
if l_completed_without_errors then
83+
l_completed_without_errors := self.after_all.do_execute(self, a_listener);
84+
end if;
85+
86+
self.rollback_to_savepoint(l_suite_savepoint);
87+
else
88+
for i in 1..self.items.count loop
89+
if self.items(i) is of(ut_test) then
6490
l_completed_without_errors := self.items(i).do_execute(a_listener);
6591
end if;
66-
67-
--after each
68-
if l_completed_without_errors then
69-
--includes listener calls for before and after actions
70-
l_completed_without_errors := self.after_each.do_execute(self, a_listener);
71-
end if;
72-
--rollback to savepoint
73-
self.items(i).rollback_to_savepoint(l_item_savepoint);
74-
75-
-- exit when not l_completed_without_errors;
7692
end loop;
7793
end if;
7894

79-
if l_completed_without_errors then
80-
l_completed_without_errors := self.after_all.do_execute(self, a_listener);
81-
end if;
82-
8395
self.calc_execution_result();
84-
85-
self.rollback_to_savepoint(l_suite_savepoint);
86-
8796
self.end_time := current_timestamp;
8897

89-
a_listener.fire_after_event(ut_utils.gc_suite,self);
9098
end if;
99+
a_listener.fire_after_event(ut_utils.gc_suite,self);
91100

92101
return l_completed_without_errors;
93102
end;

‎source/core/types/ut_suite_item.tpb‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ create or replace type body ut_suite_item as
2424
begin
2525
return ut_utils.int_to_boolean(self.ignore_flag);
2626
end;
27+
28+
final member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) is
29+
l_completed_without_errors boolean;
30+
begin
31+
l_completed_without_errors := self.do_execute(a_listener);
32+
end;
2733

2834
member function create_savepoint_if_needed return varchar2 is
2935
l_savepoint varchar2(30);

‎source/core/types/ut_suite_item.tps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ create or replace type ut_suite_item under ut_suite_item_base (
1111
member function execution_time return number,
1212

1313
not instantiable member function do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) return boolean,
14-
not instantiable member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
14+
final member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
1515
not instantiable member procedure calc_execution_result(self in out nocopy ut_suite_item)
1616

1717
)

‎source/core/types/ut_test.tpb‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ create or replace type body ut_test as
2323
return l_is_valid;
2424
end;
2525

26-
overriding member procedure do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) is
27-
l_completed_without_errors boolean;
28-
begin
29-
l_completed_without_errors := self.do_execute(a_listener);
30-
end;
31-
3226
overriding member function do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) return boolean is
3327
l_completed_without_errors boolean;
3428
l_savepoint varchar2(30);

‎source/core/types/ut_test.tps‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ create or replace type ut_test under ut_suite_item (
2323
a_path varchar2 := null, a_rollback_type integer := null, a_ignore_flag boolean := false, a_before_test_proc_name varchar2 := null, a_after_test_proc_name varchar2 := null
2424
) return self as result,
2525
member function is_valid return boolean,
26-
overriding member procedure do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base),
2726
overriding member function do_execute(self in out nocopy ut_test, a_listener in out nocopy ut_event_listener_base) return boolean,
2827
overriding member procedure calc_execution_result(self in out nocopy ut_test)
2928
)

0 commit comments

Comments
 (0)