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

Skip to content

Commit 05b334c

Browse files
PazusPazus
committed
reworked hooks
1 parent 678fbb1 commit 05b334c

6 files changed

Lines changed: 180 additions & 107 deletions

File tree

‎source/types/ut_composite_reporter.tpb‎

Lines changed: 74 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,101 +22,146 @@ create or replace type body ut_composite_reporter is
2222
self.reporters.delete(self.reporters.last);
2323

2424
end;
25-
26-
overriding member procedure before_execution(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list) is
25+
26+
overriding member procedure before_run(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list) is
2727
begin
2828
for i in 1 .. self.reporters.count loop
29-
self.reporters(i).before_execution(a_suites => a_suites);
29+
self.reporters(i).before_run(a_suites => a_suites);
30+
end loop;
31+
end;
32+
overriding member procedure after_run(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list) is
33+
begin
34+
for i in 1 .. self.reporters.count loop
35+
self.reporters(i).after_run(a_suites => a_suites);
3036
end loop;
3137
end;
3238

39+
-- suite hooks
3340
overriding member procedure before_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
3441
begin
3542
for i in 1 .. self.reporters.count loop
3643
self.reporters(i).before_suite(a_suite => a_suite);
3744
end loop;
3845
end;
3946

40-
overriding member procedure on_suite_setup(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
47+
overriding member procedure before_suite_setup(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
48+
begin
49+
for i in 1 .. self.reporters.count loop
50+
self.reporters(i).before_suite_setup(a_suite => a_suite);
51+
end loop;
52+
end;
53+
overriding member procedure after_suite_setup(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
4154
begin
4255
for i in 1 .. self.reporters.count loop
43-
self.reporters(i).on_suite_setup(a_suite => a_suite);
56+
self.reporters(i).after_suite_setup(a_suite => a_suite);
4457
end loop;
4558
end;
4659

47-
overriding member procedure before_test(self in out nocopy ut_composite_reporter, a_test in ut_object) is
60+
overriding member procedure before_suite_item(self in out nocopy ut_composite_reporter, a_suite in ut_object, a_item_index pls_integer) is
4861
begin
4962
for i in 1 .. self.reporters.count loop
50-
self.reporters(i).before_test(a_test => a_test);
63+
self.reporters(i).before_suite_item(a_suite => a_suite, a_item_index => a_item_index);
64+
end loop;
65+
end;
66+
overriding member procedure after_suite_item(self in out nocopy ut_composite_reporter, a_suite in ut_object, a_item_index pls_integer) is
67+
begin
68+
for i in 1 .. self.reporters.count loop
69+
self.reporters(i).after_suite_item(a_suite => a_suite, a_item_index => a_item_index);
5170
end loop;
5271
end;
5372

54-
overriding member procedure on_test_setup(self in out nocopy ut_composite_reporter, a_test in ut_object) is
73+
overriding member procedure before_suite_teardown(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
5574
begin
5675
for i in 1 .. self.reporters.count loop
57-
self.reporters(i).on_test_setup(a_test => a_test);
76+
self.reporters(i).before_suite_teardown(a_suite => a_suite);
5877
end loop;
5978
end;
60-
overriding member procedure on_test_execute(self in out nocopy ut_composite_reporter, a_test in ut_object) is
79+
overriding member procedure after_suite_teardown(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
6180
begin
6281
for i in 1 .. self.reporters.count loop
63-
self.reporters(i).on_test_execute(a_test => a_test);
82+
self.reporters(i).after_suite_teardown(a_suite => a_suite);
6483
end loop;
6584
end;
66-
overriding member procedure on_test_teardown(self in out nocopy ut_composite_reporter, a_test in ut_object) is
85+
86+
overriding member procedure after_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
6787
begin
6888
for i in 1 .. self.reporters.count loop
69-
self.reporters(i).on_test_teardown(a_test => a_test);
89+
self.reporters(i).after_suite(a_suite => a_suite);
7090
end loop;
7191
end;
7292

73-
overriding member procedure before_asserts_process(self in out nocopy ut_composite_reporter, a_test in ut_object) is
93+
-- test hooks
94+
overriding member procedure before_test(self in out nocopy ut_composite_reporter, a_test in ut_object) is
7495
begin
7596
for i in 1 .. self.reporters.count loop
76-
self.reporters(i).before_asserts_process(a_test => a_test);
97+
self.reporters(i).before_test(a_test => a_test);
7798
end loop;
7899
end;
79-
overriding member procedure on_assert_process(self in out nocopy ut_composite_reporter, a_assert in ut_object) is
100+
101+
overriding member procedure before_test_setup(self in out nocopy ut_composite_reporter, a_test in ut_object) is
80102
begin
81103
for i in 1 .. self.reporters.count loop
82-
self.reporters(i).on_assert_process(a_assert => a_assert);
104+
self.reporters(i).before_test_setup(a_test => a_test);
83105
end loop;
84106
end;
85-
overriding member procedure after_asserts_process(self in out nocopy ut_composite_reporter, a_test in ut_object) is
107+
overriding member procedure after_test_setup(self in out nocopy ut_composite_reporter, a_test in ut_object) is
86108
begin
87109
for i in 1 .. self.reporters.count loop
88-
self.reporters(i).after_asserts_process(a_test => a_test);
110+
self.reporters(i).after_test_setup(a_test => a_test);
89111
end loop;
90112
end;
91113

92-
overriding member procedure after_test(self in out nocopy ut_composite_reporter, a_test in ut_object) is
114+
overriding member procedure before_test_execute(self in out nocopy ut_composite_reporter, a_test in ut_object) is
93115
begin
94116
for i in 1 .. self.reporters.count loop
95-
self.reporters(i).after_test(a_test => a_test);
117+
self.reporters(i).before_test_execute(a_test => a_test);
118+
end loop;
119+
end;
120+
overriding member procedure after_test_execute(self in out nocopy ut_composite_reporter, a_test in ut_object) is
121+
begin
122+
for i in 1 .. self.reporters.count loop
123+
self.reporters(i).after_test_execute(a_test => a_test);
96124
end loop;
97125
end;
98126

99-
overriding member procedure on_suite_teardown(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
127+
overriding member procedure before_test_teardown(self in out nocopy ut_composite_reporter, a_test in ut_object) is
128+
begin
129+
for i in 1 .. self.reporters.count loop
130+
self.reporters(i).before_test_teardown(a_test => a_test);
131+
end loop;
132+
end;
133+
overriding member procedure after_test_teardown(self in out nocopy ut_composite_reporter, a_test in ut_object) is
100134
begin
101135
for i in 1 .. self.reporters.count loop
102-
self.reporters(i).on_suite_teardown(a_suite => a_suite);
136+
self.reporters(i).after_test_teardown(a_test => a_test);
103137
end loop;
104138
end;
105139

106-
overriding member procedure after_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object) is
140+
overriding member procedure before_asserts_process(self in out nocopy ut_composite_reporter, a_test in ut_object) is
107141
begin
108142
for i in 1 .. self.reporters.count loop
109-
self.reporters(i).after_suite(a_suite => a_suite);
143+
self.reporters(i).before_asserts_process(a_test => a_test);
144+
end loop;
145+
end;
146+
overriding member procedure on_assert_process(self in out nocopy ut_composite_reporter, a_assert in ut_object) is
147+
begin
148+
for i in 1 .. self.reporters.count loop
149+
self.reporters(i).on_assert_process(a_assert => a_assert);
150+
end loop;
151+
end;
152+
overriding member procedure after_asserts_process(self in out nocopy ut_composite_reporter, a_test in ut_object) is
153+
begin
154+
for i in 1 .. self.reporters.count loop
155+
self.reporters(i).after_asserts_process(a_test => a_test);
110156
end loop;
111157
end;
112158

113-
overriding member procedure after_execution(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list) is
159+
overriding member procedure after_test(self in out nocopy ut_composite_reporter, a_test in ut_object) is
114160
begin
115161
for i in 1 .. self.reporters.count loop
116-
self.reporters(i).after_execution(a_suites => a_suites);
162+
self.reporters(i).after_test(a_test => a_test);
117163
end loop;
118-
end;
119-
164+
end;
120165

121166
end;
122167
/

‎source/types/ut_composite_reporter.tps‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,41 @@ create or replace type ut_composite_reporter under ut_reporter
77
member procedure add_reporter(self in out nocopy ut_composite_reporter, a_reporter ut_reporter),
88
member procedure remove_reporter(self in out nocopy ut_composite_reporter, a_index pls_integer),
99

10-
overriding member procedure before_execution(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list),
10+
-- tese-run hooks
11+
overriding member procedure before_run(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list),
12+
overriding member procedure after_run(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list),
1113

14+
-- suite hooks
1215
overriding member procedure before_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object),
1316

14-
overriding member procedure on_suite_setup(self in out nocopy ut_composite_reporter, a_suite in ut_object),
17+
overriding member procedure before_suite_setup(self in out nocopy ut_composite_reporter, a_suite in ut_object),
18+
overriding member procedure after_suite_setup(self in out nocopy ut_composite_reporter, a_suite in ut_object),
1519

20+
overriding member procedure before_suite_item(self in out nocopy ut_composite_reporter, a_suite in ut_object, a_item_index pls_integer),
21+
overriding member procedure after_suite_item(self in out nocopy ut_composite_reporter, a_suite in ut_object, a_item_index pls_integer),
22+
23+
overriding member procedure before_suite_teardown(self in out nocopy ut_composite_reporter, a_suite in ut_object),
24+
overriding member procedure after_suite_teardown(self in out nocopy ut_composite_reporter, a_suite in ut_object),
25+
26+
overriding member procedure after_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object),
27+
28+
-- test hooks
1629
overriding member procedure before_test(self in out nocopy ut_composite_reporter, a_test in ut_object),
1730

18-
overriding member procedure on_test_setup(self in out nocopy ut_composite_reporter, a_test in ut_object),
19-
overriding member procedure on_test_execute(self in out nocopy ut_composite_reporter, a_test in ut_object),
20-
overriding member procedure on_test_teardown(self in out nocopy ut_composite_reporter, a_test in ut_object),
31+
overriding member procedure before_test_setup(self in out nocopy ut_composite_reporter, a_test in ut_object),
32+
overriding member procedure after_test_setup(self in out nocopy ut_composite_reporter, a_test in ut_object),
33+
34+
overriding member procedure before_test_execute(self in out nocopy ut_composite_reporter, a_test in ut_object),
35+
overriding member procedure after_test_execute(self in out nocopy ut_composite_reporter, a_test in ut_object),
36+
37+
overriding member procedure before_test_teardown(self in out nocopy ut_composite_reporter, a_test in ut_object),
38+
overriding member procedure after_test_teardown(self in out nocopy ut_composite_reporter, a_test in ut_object),
2139

2240
overriding member procedure before_asserts_process(self in out nocopy ut_composite_reporter, a_test in ut_object),
2341
overriding member procedure on_assert_process(self in out nocopy ut_composite_reporter, a_assert in ut_object),
2442
overriding member procedure after_asserts_process(self in out nocopy ut_composite_reporter, a_test in ut_object),
2543

26-
overriding member procedure after_test(self in out nocopy ut_composite_reporter, a_test in ut_object),
27-
28-
overriding member procedure on_suite_teardown(self in out nocopy ut_composite_reporter, a_suite in ut_object),
29-
30-
overriding member procedure after_suite(self in out nocopy ut_composite_reporter, a_suite in ut_object),
31-
32-
overriding member procedure after_execution(self in out nocopy ut_composite_reporter, a_suites in ut_objects_list)
44+
overriding member procedure after_test(self in out nocopy ut_composite_reporter, a_test in ut_object)
3345

3446
)
3547
not final

‎source/types/ut_reporter.tpb‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,92 +6,87 @@ create or replace type body ut_reporter is
66
return;
77
end;
88

9-
member procedure before_execution(self in out nocopy ut_reporter, a_suites in ut_objects_list) is
9+
member procedure before_run(self in out nocopy ut_reporter, a_suites in ut_objects_list) is
10+
begin
11+
null;
12+
end;
13+
member procedure after_run(self in out nocopy ut_reporter, a_suites in ut_objects_list) is
1014
begin
1115
null;
1216
end;
13-
1417
member procedure before_suite(self in out nocopy ut_reporter, a_suite in ut_object) is
1518
begin
1619
null;
1720
end;
18-
19-
/*member procedure after_suite_begin(self in out nocopy ut_reporter, a_suite in ut_object) is
21+
member procedure before_suite_setup(self in out nocopy ut_reporter, a_suite in ut_object) is
2022
begin
2123
null;
22-
end;*/
23-
24-
member procedure on_suite_setup(self in out nocopy ut_reporter, a_suite in ut_object) is
24+
end;
25+
member procedure after_suite_setup(self in out nocopy ut_reporter, a_suite in ut_object) is
2526
begin
2627
null;
2728
end;
28-
29-
/*member procedure after_suite_setup(self in out nocopy ut_reporter, a_suite in ut_object) is
29+
member procedure before_suite_item(self in out nocopy ut_reporter, a_suite in ut_object, a_item_index pls_integer) is
3030
begin
3131
null;
32-
end;*/
33-
34-
member procedure before_test(self in out nocopy ut_reporter, a_test in ut_object) is
32+
end;
33+
member procedure after_suite_item(self in out nocopy ut_reporter, a_suite in ut_object, a_item_index pls_integer) is
3534
begin
3635
null;
3736
end;
38-
39-
member procedure before_asserts_process(self in out nocopy ut_reporter, a_test in ut_object) is
37+
member procedure before_suite_teardown(self in out nocopy ut_reporter, a_suite in ut_object) is
4038
begin
4139
null;
4240
end;
43-
44-
member procedure on_test_setup(self in out nocopy ut_reporter, a_test in ut_object) is
41+
member procedure after_suite_teardown(self in out nocopy ut_reporter, a_suite in ut_object) is
4542
begin
4643
null;
4744
end;
48-
49-
member procedure on_test_execute(self in out nocopy ut_reporter, a_test in ut_object) is
45+
member procedure after_suite(self in out nocopy ut_reporter, a_suite in ut_object) is
5046
begin
5147
null;
5248
end;
53-
54-
member procedure on_test_teardown(self in out nocopy ut_reporter, a_test in ut_object) is
49+
member procedure before_test(self in out nocopy ut_reporter, a_test in ut_object) is
5550
begin
5651
null;
5752
end;
58-
59-
member procedure on_assert_process(self in out nocopy ut_reporter, a_assert in ut_object) is
53+
member procedure before_test_setup(self in out nocopy ut_reporter, a_test in ut_object) is
6054
begin
6155
null;
6256
end;
63-
64-
member procedure after_asserts_process(self in out nocopy ut_reporter, a_test in ut_object) is
57+
member procedure after_test_setup(self in out nocopy ut_reporter, a_test in ut_object) is
6558
begin
6659
null;
6760
end;
68-
69-
member procedure after_test(self in out nocopy ut_reporter, a_test in ut_object) is
61+
member procedure before_test_execute(self in out nocopy ut_reporter, a_test in ut_object) is
7062
begin
7163
null;
7264
end;
73-
74-
member procedure on_suite_teardown(self in out nocopy ut_reporter, a_suite in ut_object) is
65+
member procedure after_test_execute(self in out nocopy ut_reporter, a_test in ut_object) is
7566
begin
7667
null;
7768
end;
78-
79-
/*member procedure after_suite_teardown(self in out nocopy ut_reporter, a_suite in ut_object) is
69+
member procedure before_test_teardown(self in out nocopy ut_reporter, a_test in ut_object) is
8070
begin
8171
null;
82-
end;*/
83-
84-
/*member procedure before_suite_end(self in out nocopy ut_reporter, a_suite in ut_object) is
72+
end;
73+
member procedure after_test_teardown(self in out nocopy ut_reporter, a_test in ut_object) is
8574
begin
8675
null;
87-
end;*/
88-
89-
member procedure after_suite(self in out nocopy ut_reporter, a_suite in ut_object) is
76+
end;
77+
member procedure before_asserts_process(self in out nocopy ut_reporter, a_test in ut_object) is
9078
begin
9179
null;
9280
end;
93-
94-
member procedure after_execution(self in out nocopy ut_reporter, a_suites in ut_objects_list) is
81+
member procedure on_assert_process(self in out nocopy ut_reporter, a_assert in ut_object) is
82+
begin
83+
null;
84+
end;
85+
member procedure after_asserts_process(self in out nocopy ut_reporter, a_test in ut_object) is
86+
begin
87+
null;
88+
end;
89+
member procedure after_test(self in out nocopy ut_reporter, a_test in ut_object) is
9590
begin
9691
null;
9792
end;

0 commit comments

Comments
 (0)