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

Skip to content

Commit 80f7387

Browse files
jgebaljgebal
committed
Cleanup of not needed loops in code - made use of print_clob procedure in ut_reporter_base.
1 parent 5653ccf commit 80f7387

8 files changed

Lines changed: 35 additions & 70 deletions

‎source/core/types/ut_reporter_base.tpb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ create or replace type body ut_reporter_base is
2929
ut_output_buffer.send_line(self,a_text);
3030
end;
3131

32-
member procedure print_output(self in out nocopy ut_reporter_base, a_output clob) is
32+
member procedure print_clob(self in out nocopy ut_reporter_base, a_clob clob) is
3333
l_lines ut_varchar2_list;
3434
begin
35-
if a_output is not null and dbms_lob.getlength(a_output) > 0 then
36-
l_lines := ut_utils.clob_to_table(a_output);
35+
if a_clob is not null and dbms_lob.getlength(a_clob) > 0 then
36+
l_lines := ut_utils.clob_to_table(a_clob);
3737
for i in 1 .. l_lines.count loop
3838
self.print_text(l_lines(i));
3939
end loop;

‎source/core/types/ut_reporter_base.tps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ create or replace type ut_reporter_base authid current_user as object(
2222

2323
member procedure print_text(self in out nocopy ut_reporter_base, a_text varchar2),
2424

25-
member procedure print_output(self in out nocopy ut_reporter_base, a_output clob),
25+
member procedure print_clob(self in out nocopy ut_reporter_base, a_clob clob),
2626

2727
-- run hooks
2828
member procedure before_calling_run(self in out nocopy ut_reporter_base, a_run in ut_run),

‎source/reporters/ut_coverage_html_reporter.tpb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@ create or replace type body ut_coverage_html_reporter is
102102

103103
l_coverage_data := ut_coverage.get_coverage_data();
104104

105-
l_report_lines := ut_utils.clob_to_table(ut_coverage_report_html_helper.get_index( l_coverage_data, self.assets_path, self.project_name ));
106-
for i in 1 .. l_report_lines.count loop
107-
self.print_text( l_report_lines(i) );
108-
end loop;
105+
self.print_clob( ut_coverage_report_html_helper.get_index( l_coverage_data, self.assets_path, self.project_name ) );
109106

110107
(self as ut_reporter_base).after_calling_run(a_run);
111108
end;

‎source/reporters/ut_coverage_sonar_reporter.tpb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,7 @@ create or replace type body ut_coverage_sonar_reporter is
140140

141141
l_coverage_data := ut_coverage.get_coverage_data();
142142

143-
l_report_lines := ut_utils.clob_to_table(get_coverage_xml( l_coverage_data ));
144-
for i in 1 .. l_report_lines.count loop
145-
self.print_text( l_report_lines(i) );
146-
end loop;
143+
self.print_clob( get_coverage_xml( l_coverage_data ) );
147144

148145
(self as ut_reporter_base).after_calling_run(a_run);
149146
end;

‎source/reporters/ut_coveralls_reporter.tpb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,7 @@ create or replace type body ut_coveralls_reporter is
154154

155155
l_coverage_data := ut_coverage.get_coverage_data();
156156

157-
l_report_lines := ut_utils.clob_to_table(get_coverage_json( l_coverage_data ));
158-
for i in 1 .. l_report_lines.count loop
159-
self.print_text( l_report_lines(i) );
160-
end loop;
157+
self.print_clob( get_coverage_json( l_coverage_data ) );
161158

162159
(self as ut_reporter_base).after_calling_run(a_run);
163160
end;

‎source/reporters/ut_documentation_reporter.tpb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ create or replace type body ut_documentation_reporter is
6262
end if;
6363

6464
-- reproduce the output from before/after procedures and the test
65-
self.print_output(a_test.get_serveroutputs);
65+
self.print_clob(a_test.get_serveroutputs);
6666
end;
6767

6868
overriding member procedure after_calling_before_all(self in out nocopy ut_documentation_reporter, a_suite in ut_logical_suite) is
6969
begin
70-
self.print_output(treat(a_suite as ut_suite).before_all.serveroutput);
70+
self.print_clob(treat(a_suite as ut_suite).before_all.serveroutput);
7171
end;
7272

7373
overriding member procedure after_calling_after_all(self in out nocopy ut_documentation_reporter, a_suite in ut_logical_suite) is
7474
begin
75-
self.print_output(treat(a_suite as ut_suite).after_all.serveroutput);
75+
self.print_clob(treat(a_suite as ut_suite).after_all.serveroutput);
7676
end;
7777

7878
overriding member procedure after_calling_suite(self in out nocopy ut_documentation_reporter, a_suite ut_logical_suite) as

‎source/reporters/ut_teamcity_reporter.tpb‎

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ create or replace type body ut_teamcity_reporter is
22
/*
33
utPLSQL - Version X.X.X.X
44
Copyright 2016 - 2017 utPLSQL Project
5-
5+
66
Licensed under the Apache License, Version 2.0 (the "License"):
77
you may not use this file except in compliance with the License.
88
You may obtain a copy of the License at
9-
9+
1010
http://www.apache.org/licenses/LICENSE-2.0
11-
11+
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
1414
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,68 +39,52 @@ create or replace type body ut_teamcity_reporter is
3939
overriding member procedure before_calling_test(self in out nocopy ut_teamcity_reporter, a_test in ut_test) is
4040
l_test_full_name varchar2(4000);
4141
begin
42-
42+
4343
l_test_full_name := lower(a_test.item.owner_name) || '.' || lower(a_test.item.object_name) || '.' ||
4444
lower(a_test.item.procedure_name);
45-
45+
4646
self.print_text(ut_teamcity_reporter_helper.test_started(a_test_name => l_test_full_name
4747
,a_capture_standard_output => true));
48-
48+
4949
end;
5050

5151
overriding member procedure after_calling_test(self in out nocopy ut_teamcity_reporter, a_test in ut_test) is
5252
l_assert ut_assert_result;
5353
l_test_full_name varchar2(4000);
5454
l_std_err_msg varchar2(32767);
55-
procedure print_output(a_exectable ut_executable) is
56-
l_lines ut_varchar2_list;
57-
begin
58-
if a_exectable is not null and a_exectable.is_defined and a_exectable.serveroutput is not null and
59-
dbms_lob.getlength(a_exectable.serveroutput) > 0 then
60-
l_lines := ut_utils.clob_to_table(a_exectable.serveroutput);
61-
for i in 1 .. l_lines.count loop
62-
self.print_text(l_lines(i));
63-
end loop;
64-
end if;
65-
end;
6655
begin
6756
-- l_test_full_name := self.suite_names_stack(self.suite_names_stack.last) || ':' ||
6857
-- nvl(replace(a_test.description, '.'), a_test.name);
6958
l_test_full_name := lower(a_test.item.owner_name) || '.' || lower(a_test.item.object_name) || '.' ||
7059
lower(a_test.item.procedure_name);
71-
60+
7261
if a_test.result = ut_utils.tr_ignore then
7362
self.print_text(ut_teamcity_reporter_helper.test_ignored(l_test_full_name));
7463
else
75-
76-
-- reproduce the output from before/after procedures and the test
77-
print_output(a_test.before_each);
78-
print_output(a_test.before_test);
79-
print_output(a_test.item);
80-
print_output(a_test.after_test);
81-
print_output(a_test.after_each);
82-
64+
65+
self.print_clob(a_test.get_serveroutputs());
66+
8367
if a_test.result = ut_utils.tr_error then
8468
if a_test.before_each.error_backtrace is not null then
8569
l_std_err_msg := l_std_err_msg || 'Before each exception:' || chr(10) || a_test.before_each.error_backtrace || chr(10);
8670
end if;
87-
71+
8872
if a_test.before_test.error_backtrace is not null then
8973
l_std_err_msg := l_std_err_msg || 'Before test exception:' || chr(10) || a_test.before_test.error_backtrace || chr(10);
9074
end if;
91-
75+
9276
if a_test.item.error_backtrace is not null then
9377
l_std_err_msg := l_std_err_msg || 'Test exception:' || chr(10) || a_test.item.error_backtrace || chr(10);
9478
end if;
95-
79+
9680
if a_test.after_test.error_backtrace is not null then
9781
l_std_err_msg := l_std_err_msg || 'After test exception:' || chr(10) || a_test.after_test.error_backtrace || chr(10);
9882
end if;
99-
83+
10084
if a_test.after_each.error_backtrace is not null then
10185
l_std_err_msg := l_std_err_msg || 'After each exception:' || chr(10) || a_test.after_each.error_backtrace || chr(10);
10286
end if;
103-
87+
10488
self.print_text(ut_teamcity_reporter_helper.test_std_err(a_test_name => l_test_full_name
10589
,a_out => trim(l_std_err_msg)));
10690
self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name
@@ -109,9 +93,9 @@ create or replace type body ut_teamcity_reporter is
10993
.message));
11094
elsif a_test.results is not null and a_test.results.count > 0 then
11195
for i in 1 .. a_test.results.count loop
112-
96+
11397
l_assert := a_test.results(i);
114-
98+
11599
if l_assert.result > ut_utils.tr_success then
116100
self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name
117101
,a_msg => l_assert.message
@@ -128,17 +112,17 @@ create or replace type body ut_teamcity_reporter is
128112
-- Teamcity supports only a single failure message
129113
exit;
130114
end if;
131-
115+
132116
end loop;
133117
elsif a_test.result = ut_utils.tr_failure then
134118
self.print_text(ut_teamcity_reporter_helper.test_failed(a_test_name => l_test_full_name
135119
,a_msg => 'Test failed'));
136120
end if;
137-
121+
138122
self.print_text(ut_teamcity_reporter_helper.test_finished(l_test_full_name, trunc(a_test.execution_time * 1e3)));
139-
123+
140124
end if;
141-
125+
142126
end;
143127

144128
end;

‎source/reporters/ut_xunit_reporter.tpb‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ create or replace type body ut_xunit_reporter is
4646
if a_test.result = ut_utils.tr_error then
4747
self.print_text('<error>');
4848
self.print_text('<![CDATA[');
49-
self.print_text(ut_utils.table_to_clob(a_test.get_error_stack_traces()));
49+
self.print_clob(ut_utils.table_to_clob(a_test.get_error_stack_traces()));
5050
self.print_text(']]>');
5151
self.print_text('</error>');
5252
elsif a_test.result > ut_utils.tr_success then
@@ -66,10 +66,7 @@ create or replace type body ut_xunit_reporter is
6666
if l_output is not null then
6767
self.print_text('<system-out>');
6868
self.print_text('<![CDATA[');
69-
l_lines := ut_utils.clob_to_table(l_output);
70-
for i in 1 .. l_lines.count loop
71-
self.print_text(l_lines(i));
72-
end loop;
69+
self.print_clob(l_output);
7370
self.print_text(']]>');
7471
self.print_text('</system-out>');
7572
end if;
@@ -80,7 +77,6 @@ create or replace type body ut_xunit_reporter is
8077
l_tests_count integer := a_suite.results_count.ignored_count + a_suite.results_count.success_count +
8178
a_suite.results_count.failure_count + a_suite.results_count.errored_count;
8279
l_suite ut_suite;
83-
l_lines ut_varchar2_list;
8480
begin
8581
a_suite_id := a_suite_id + 1;
8682
self.print_text('<testsuite tests="' || l_tests_count || '"' || ' id="' || a_suite_id || '"' || ' package="' ||
@@ -91,14 +87,8 @@ create or replace type body ut_xunit_reporter is
9187
if l_suite.before_all.serveroutput is not null or l_suite.after_all.serveroutput is not null then
9288
self.print_text('<system-out>');
9389
self.print_text('<![CDATA[');
94-
l_lines := ut_utils.clob_to_table(l_suite.before_all.serveroutput);
95-
for i in 1 .. l_lines.count loop
96-
self.print_text(l_lines(i));
97-
end loop;
98-
l_lines := ut_utils.clob_to_table(l_suite.after_all.serveroutput);
99-
for i in 1 .. l_lines.count loop
100-
self.print_text(l_lines(i));
101-
end loop;
90+
self.print_clob(l_suite.before_all.serveroutput);
91+
self.print_clob(l_suite.after_all.serveroutput);
10292
self.print_text(']]>');
10393
self.print_text('</system-out>');
10494
end if;

0 commit comments

Comments
 (0)