Skip to content

Commit 74ec9a1

Browse files
jgebaljgebal
committed
Removed unused code.
Added additional tests to: - cover functionality of reporting warnings on transaction invalidation with sub-suites. - cover functionality of failing a test in sub-suite when beforeall fails in parent suite with logical suites in between. Refactored `ut_teamcity_reporter` a bit.
1 parent eeae79b commit 74ec9a1

27 files changed

+186
-291
lines changed

‎examples/RunDeveloperExamples.sql‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ set linesize 1000
66

77
exec ut_ansiconsole_helper.color_enabled(true);
88
--developer examples
9-
prompt RunExampleComplexSuiteWithCustomReporter
10-
@@developer_examples/RunExampleComplexSuiteWithCustomReporter.sql
119
prompt RunExampleTestSuiteWithCustomReporter
1210
@@developer_examples/RunExampleTestSuiteWithCustomReporter.sql
1311
prompt RunExampleTestAnnotationsParsingTimeHugePackage

‎examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎examples/developer_examples/RunExampleTestSuite.sql‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ begin
2121
l_test.description := 'Example test1';
2222
l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test));
2323
l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test));
24-
l_suite.add_item(l_test);
24+
l_suite.items.extend;
25+
l_suite.items(l_suite.items.last) := l_test;
2526

2627
l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6);
2728
l_test.description := 'Another example test';
2829
l_test.before_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','SETUP',ut_utils.gc_before_test));
2930
l_test.after_test_list := ut_executables(ut_executable(user, 'UT_EXAMPLETEST2','TEARDOWN',ut_utils.gc_after_test));
30-
l_suite.add_item(l_test);
31+
l_suite.items.extend;
32+
l_suite.items(l_suite.items.last) := l_test;
3133

3234
l_suite.do_execute();
3335

‎examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set echo off
1212

1313
PROMPT Runs test report using composite reporter
1414
declare
15-
suite ut_logical_suite;
15+
l_suite ut_logical_suite;
1616
l_doc_reporter ut_output_reporter_base := ut_documentation_reporter();
1717
l_tc_reporter ut_output_reporter_base := ut_teamcity_reporter();
1818
l_run ut_run;
@@ -21,14 +21,16 @@ begin
2121
ut_event_manager.add_listener(l_doc_reporter);
2222
ut_event_manager.add_listener(l_tc_reporter);
2323

24-
suite := ut_suite(user, 'ut_exampletest',a_line_no=>1);
25-
suite.description := 'Test Suite Name';
24+
l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1);
25+
l_suite.description := 'Test Suite Name';
2626

27-
suite.add_item(ut_test(user,'ut_exampletest','ut_exAmpletest',a_line_no=>3));
28-
suite.add_item(ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>6));
27+
l_suite.items.extend;
28+
l_suite.items(l_suite.items.last) := ut_test(user,'ut_exampletest','ut_exAmpletest',a_line_no=>3);
29+
l_suite.items.extend;
30+
l_suite.items(l_suite.items.last) := ut_test(user, 'UT_EXAMPLETEST2','UT_EXAMPLETEST',a_line_no=>6);
2931

3032
-- provide a reporter to process results
31-
l_run := ut_run(ut_suite_items(suite));
33+
l_run := ut_run(ut_suite_items(l_suite));
3234
l_run.do_execute();
3335

3436
ut_event_manager.trigger_event(ut_utils.gc_finalize, l_run);

‎examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ begin
2828
l_test.description := 'Example test1';
2929
l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','Setup',ut_utils.gc_before_test));
3030
l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','tEardown',ut_utils.gc_after_test));
31-
l_suite.add_item(l_test);
31+
l_suite.items.extend;
32+
l_suite.items(l_suite.items.last) := l_test;
3233

3334
l_test := ut_test(user, 'UT_EXAMPLETEST2','ut_exAmpletest',a_line_no=>6);
3435
l_test.description := 'Another example test';
3536
l_test.before_test_list := ut_executables(ut_executable(user, 'ut_exampletest','SETUP',ut_utils.gc_before_test));
3637
l_test.after_test_list := ut_executables(ut_executable(user, 'ut_exampletest','TEARDOWN',ut_utils.gc_after_test));
37-
l_suite.add_item(l_test);
38+
l_suite.items.extend;
39+
l_suite.items(l_suite.items.last) := l_test;
3840

3941
-- provide a reporter to process results tabbing each hierarcy level by tab_size
4042
l_reporter := ut_custom_reporter(a_tab_size => 2);

‎source/core/annotations/ut_annotation_manager.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ create or replace package body ut_annotation_manager as
193193
ut_annotation_cache_manager.cleanup_cache(l_objects_to_parse);
194194

195195
if sys_context('userenv','current_schema') = a_object_owner
196-
or ut_metadata.is_object_visible('ut3.ut_utils')
196+
or ut_metadata.user_has_execute_any_proc()
197197
or ut_metadata.is_object_visible('dba_objects')
198198
then
199199
ut_annotation_cache_manager.remove_from_cache(

‎source/core/types/ut_console_reporter_base.tpb‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,10 @@ create or replace type body ut_console_reporter_base is
3636
self.print_text(ut_ansiconsole_helper.yellow(a_text));
3737
end;
3838

39-
member procedure print_blue_text(self in out nocopy ut_console_reporter_base, a_text varchar2) is
40-
begin
41-
self.print_text(ut_ansiconsole_helper.red(a_text));
42-
end;
43-
4439
member procedure print_cyan_text(self in out nocopy ut_console_reporter_base, a_text varchar2) is
4540
begin
4641
self.print_text(ut_ansiconsole_helper.cyan(a_text));
4742
end;
4843

49-
member procedure print_magenta_text(self in out nocopy ut_console_reporter_base, a_text varchar2) is
50-
begin
51-
self.print_text(ut_ansiconsole_helper.magenta(a_text));
52-
end;
53-
5444
end;
5545
/

‎source/core/types/ut_console_reporter_base.tps‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ create or replace type ut_console_reporter_base under ut_output_reporter_base(
2323

2424
member procedure print_yellow_text(self in out nocopy ut_console_reporter_base, a_text varchar2),
2525

26-
member procedure print_blue_text(self in out nocopy ut_console_reporter_base, a_text varchar2),
27-
28-
member procedure print_cyan_text(self in out nocopy ut_console_reporter_base, a_text varchar2),
29-
30-
member procedure print_magenta_text(self in out nocopy ut_console_reporter_base, a_text varchar2)
26+
member procedure print_cyan_text(self in out nocopy ut_console_reporter_base, a_text varchar2)
3127

3228
) not final not instantiable
3329
/

‎source/core/types/ut_logical_suite.tpb‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,6 @@ create or replace type body ut_logical_suite as
1616
limitations under the License.
1717
*/
1818

19-
constructor function ut_logical_suite(
20-
self in out nocopy ut_logical_suite,a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_path varchar2
21-
) return self as result is
22-
begin
23-
self.self_type := $$plsql_unit;
24-
self.init(a_object_owner, a_object_name, a_name, null);
25-
self.path := a_path;
26-
self.disabled_flag := ut_utils.boolean_to_int(false);
27-
self.items := ut_suite_items();
28-
return;
29-
end;
30-
31-
member function is_valid(self in out nocopy ut_logical_suite) return boolean is
32-
begin
33-
return true;
34-
end;
35-
36-
overriding member procedure add_item(
37-
self in out nocopy ut_logical_suite,
38-
a_item ut_suite_item,
39-
a_expected_level integer := 1,
40-
a_current_level integer :=1
41-
) is
42-
begin
43-
if a_expected_level > a_current_level then
44-
if self.items.last is not null then
45-
self.items(self.items.last).add_item(a_item, a_expected_level, a_current_level+1);
46-
else
47-
raise_application_error(-20000, 'cannot add suite item to sub suite at level '||a_expected_level||'. suite items at level '||a_current_level||' are empty');
48-
end if;
49-
else
50-
if self.items is null then
51-
self.items := ut_suite_items();
52-
end if;
53-
self.items.extend;
54-
self.items(self.items.last) := a_item;
55-
end if;
56-
end;
57-
5819
overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite) is
5920
begin
6021
ut_event_manager.trigger_event(ut_utils.gc_before_suite, self);

‎source/core/types/ut_logical_suite.tps‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ create or replace type ut_logical_suite under ut_suite_item (
2121
*/
2222
items ut_suite_items,
2323

24-
constructor function ut_logical_suite(
25-
self in out nocopy ut_logical_suite, a_object_owner varchar2, a_object_name varchar2, a_name varchar2, a_path varchar2
26-
) return self as result,
27-
member function is_valid(self in out nocopy ut_logical_suite) return boolean,
28-
overriding member procedure add_item(
29-
self in out nocopy ut_logical_suite,
30-
a_item ut_suite_item,
31-
a_expected_level integer := 1,
32-
a_current_level integer :=1
33-
),
3424
overriding member procedure mark_as_skipped(self in out nocopy ut_logical_suite),
3525
overriding member procedure set_rollback_type(self in out nocopy ut_logical_suite, a_rollback_type integer),
3626
overriding member function do_execute(self in out nocopy ut_logical_suite) return boolean,

0 commit comments

Comments
 (0)