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

Skip to content

Commit 9285dee

Browse files
PazusPazus
committed
refactored
1 parent 44e124d commit 9285dee

14 files changed

Lines changed: 92 additions & 69 deletions

‎source/core/types/ut_assert_result.tpb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,9 @@ create or replace type body ut_assert_result is
6262
if a_clob is not null and l_text is not null then
6363
l_text := chr(10) || l_text;
6464
end if;
65-
if l_text is not null then
66-
dbms_lob.writeappend(a_clob, length(l_text), l_text);
67-
end if;
65+
ut_utils.append_to_clob(a_clob, l_text);
6866
end;
6967
begin
70-
dbms_lob.createtemporary(l_result, true);
7168
if self.result != ut_utils.tr_success or self.error_message is not null then
7269
if self.message is not null then
7370
add_text_line(l_result, ' expectation description: ', self.message);

‎source/core/types/ut_executable.tpb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ create or replace type body ut_executable is
134134

135135
save_dbms_output;
136136

137-
l_completed_without_errors := (self.error_stack||self.error_backtrace is null);
137+
l_completed_without_errors := (self.error_stack||self.error_backtrace) is null;
138138

139139
a_listener.fire_after_event(self.associated_event_name, a_item);
140140
--listener - after call to executable
@@ -144,7 +144,7 @@ create or replace type body ut_executable is
144144

145145
member function get_error_stack_trace return varchar2 is
146146
begin
147-
return rtrim(self.error_stack||self.error_backtrace, chr(10));
147+
return rtrim(self.error_stack||'Backtrace:'||chr(10)||self.error_backtrace, chr(10));
148148
end;
149149
end;
150150
/

‎source/core/types/ut_logical_suite.tpb‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@ create or replace type body ut_logical_suite as
114114
self.end_time := self.start_time;
115115
a_listener.fire_after_event(ut_utils.gc_suite, self);
116116
end;
117+
118+
overriding member function get_error_stack_traces return ut_varchar2_list is
119+
begin
120+
return ut_varchar2_list();
121+
end;
122+
123+
overriding member function get_serveroutputs return clob is
124+
begin
125+
return null;
126+
end;
117127

118128
end;
119129
/

‎source/core/types/ut_logical_suite.tps‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ create or replace type ut_logical_suite under ut_suite_item (
3232
member procedure add_item(self in out nocopy ut_logical_suite, a_item ut_suite_item),
3333
overriding member function do_execute(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base) return boolean,
3434
overriding member procedure calc_execution_result(self in out nocopy ut_logical_suite),
35-
overriding member procedure mark_as_errored(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2)
35+
overriding member procedure mark_as_errored(self in out nocopy ut_logical_suite, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2),
36+
overriding member function get_error_stack_traces return ut_varchar2_list,
37+
overriding member function get_serveroutputs return clob
3638
) not final
3739
/

‎source/core/types/ut_run.tpb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,5 +118,17 @@ create or replace type body ut_run as
118118
return l_schemes;
119119

120120
end;
121+
122+
overriding member function get_error_stack_traces return ut_varchar2_list is
123+
begin
124+
return ut_varchar2_list();
125+
end;
126+
127+
overriding member function get_serveroutputs return clob is
128+
begin
129+
return null;
130+
end;
131+
132+
121133
end;
122134
/

‎source/core/types/ut_run.tps‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ create or replace type ut_run under ut_suite_item (
2424
overriding member function do_execute(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base) return boolean,
2525
overriding member procedure calc_execution_result(self in out nocopy ut_run),
2626
overriding member procedure mark_as_errored(self in out nocopy ut_run, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2),
27-
member function get_run_schemes return ut_varchar2_list
27+
member function get_run_schemes return ut_varchar2_list,
28+
overriding member function get_error_stack_traces return ut_varchar2_list,
29+
overriding member function get_serveroutputs return clob
2830
)
2931
/

‎source/core/types/ut_suite.tpb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ create or replace type body ut_suite as
100100
overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list is
101101
l_stack_traces ut_varchar2_list := ut_varchar2_list();
102102
begin
103-
self.add_stack_trace(l_stack_traces, self.before_all.get_error_stack_trace());
104-
self.add_stack_trace(l_stack_traces, self.after_all.get_error_stack_trace());
103+
ut_utils.append_to_varchar2_list(l_stack_traces, self.before_all.get_error_stack_trace());
104+
ut_utils.append_to_varchar2_list(l_stack_traces, self.after_all.get_error_stack_trace());
105105
return l_stack_traces;
106106
end;
107107

108108
overriding member function get_serveroutputs return clob is
109109
l_outputs clob;
110110
begin
111-
self.add_serveroutput(l_outputs, self.before_all.serveroutput );
112-
self.add_serveroutput(l_outputs, self.after_all.serveroutput );
111+
ut_utils.append_to_clob(l_outputs, self.before_all.serveroutput );
112+
ut_utils.append_to_clob(l_outputs, self.after_all.serveroutput );
113113
return l_outputs;
114114
end;
115115

‎source/core/types/ut_suite.tps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ create or replace type ut_suite under ut_logical_suite (
3535
/**
3636
* Finds the item in the suite by it's name and returns the item index
3737
*/
38-
overriding member function do_execute(self in out nocopy ut_suite , a_listener in out nocopy ut_event_listener_base) return boolean,
38+
overriding member function do_execute(self in out nocopy ut_suite , a_listener in out nocopy ut_event_listener_base) return boolean,
3939
overriding member function get_error_stack_traces(self ut_suite) return ut_varchar2_list,
4040
overriding member function get_serveroutputs return clob
4141
)

‎source/core/types/ut_suite_item.tpb‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -82,36 +82,5 @@ create or replace type body ut_suite_item as
8282
self.results_count.increase_warning_count;
8383
end;
8484

85-
not final member function get_error_stack_traces return ut_varchar2_list is
86-
begin
87-
return ut_varchar2_list();
88-
end;
89-
90-
final member procedure add_stack_trace(self in ut_suite_item, a_stack_traces in out nocopy ut_varchar2_list, a_stack_trace varchar2) is
91-
begin
92-
if a_stack_trace is not null then
93-
if a_stack_traces is null then
94-
a_stack_traces := ut_varchar2_list();
95-
end if;
96-
a_stack_traces.extend;
97-
a_stack_traces(a_stack_traces.last) := a_stack_trace;
98-
end if;
99-
end;
100-
101-
not final member function get_serveroutputs return clob is
102-
begin
103-
return null;
104-
end;
105-
106-
final member procedure add_serveroutput(self in ut_suite_item, a_serveroutputs in out nocopy clob, a_serveroutput clob) is
107-
begin
108-
if a_serveroutput is not null and dbms_lob.getlength(a_serveroutput) > 0 then
109-
if a_serveroutputs is null then
110-
dbms_lob.createtemporary(a_serveroutputs, true);
111-
end if;
112-
dbms_lob.append(a_serveroutputs, a_serveroutput);
113-
end if;
114-
end;
115-
11685
end;
11786
/

‎source/core/types/ut_suite_item.tps‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace type ut_suite_item under ut_suite_item_base (
1+
create or replace type ut_suite_item force under ut_suite_item_base (
22
/*
33
utPLSQL - Version X.X.X.X
44
Copyright 2016 - 2017 utPLSQL Project
@@ -30,11 +30,9 @@ create or replace type ut_suite_item under ut_suite_item_base (
3030
final member procedure do_execute(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
3131
not instantiable member procedure calc_execution_result(self in out nocopy ut_suite_item),
3232
not instantiable member procedure mark_as_errored(self in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base, a_error_stack_trace varchar2),
33-
member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2),
34-
not final member function get_error_stack_traces return ut_varchar2_list,
35-
final member procedure add_stack_trace(self in ut_suite_item, a_stack_traces in out nocopy ut_varchar2_list, a_stack_trace varchar2),
36-
not final member function get_serveroutputs return clob,
37-
final member procedure add_serveroutput(self in ut_suite_item, a_serveroutputs in out nocopy clob, a_serveroutput clob)
33+
not instantiable member function get_error_stack_traces return ut_varchar2_list,
34+
not instantiable member function get_serveroutputs return clob,
35+
member procedure put_warning(self in out nocopy ut_suite_item, a_message varchar2)
3836
)
3937
not final not instantiable
4038
/

0 commit comments

Comments
 (0)