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

Skip to content

Commit 8aa1e4b

Browse files
jgebaljgebal
authored
Merge pull request #2 from Pazus/feature/base_objects_refactoring
Feature/base objects refactoring
2 parents 72430fb + ed162ed commit 8aa1e4b

52 files changed

Lines changed: 256 additions & 245 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/developer_examples/RunExampleComplexSuiteWithCustomReporter.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ declare
1616
suite1 ut_suite;
1717
suite2 ut_suite;
1818
suite_complex ut_suite;
19-
listener ut_execution_listener;
19+
listener ut_event_listener;
2020
begin
2121
suite1 := ut_suite(a_object_owner=>null, a_object_name => null, a_name => null, a_description => 'Test Suite 1');
2222

@@ -43,7 +43,7 @@ begin
4343
suite_complex.items := ut_suite_items(suite1, suite2);
4444

4545
-- provide a reporter to process results
46-
listener := ut_execution_listener(ut_reporters(ut_custom_reporter(a_tab_size => 2)));
46+
listener := ut_event_listener(ut_reporters(ut_custom_reporter(a_tab_size => 2)));
4747
suite_complex.do_execute(listener);
4848
end;
4949
/

‎examples/developer_examples/RunExampleTestSuite.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set echo off
1212

1313
declare
1414
suite ut_suite;
15-
listener ut_execution_listener := ut_execution_listener(ut_reporters());
15+
listener ut_event_listener := ut_event_listener(ut_reporters());
1616
test_item ut_test;
1717
assert ut_assert_result;
1818
begin

‎examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set echo off
1313
PROMPT Runs test report using composite reporter
1414
declare
1515
suite ut_suite;
16-
listener ut_execution_listener;
16+
listener ut_event_listener;
1717
begin
1818
suite := ut_suite(a_object_owner=>null, a_object_name => 'ut_exampletest', a_name => null, a_description => 'Test Suite Name');
1919

@@ -35,7 +35,7 @@ begin
3535
);
3636

3737
-- provide a reporter to process results
38-
listener := ut_execution_listener(ut_reporters(ut_documentation_reporter, ut_teamcity_reporter));
38+
listener := ut_event_listener(ut_reporters(ut_documentation_reporter, ut_teamcity_reporter));
3939
suite.do_execute(listener);
4040
end;
4141
/

‎examples/developer_examples/RunExampleTestSuiteWithCustomReporter.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set echo off
1515

1616
declare
1717
suite ut_suite;
18-
listener ut_execution_listener;
18+
listener ut_event_listener;
1919
begin
2020
-- Install ut_custom_reporter first from example folder
2121

@@ -39,7 +39,7 @@ begin
3939
);
4040

4141
-- provide a reporter to process results tabbing each hierarcy level by tab_size
42-
listener := ut_execution_listener(ut_reporters(ut_custom_reporter(a_tab_size => 2)));
42+
listener := ut_event_listener(ut_reporters(ut_custom_reporter(a_tab_size => 2)));
4343
suite.do_execute(listener);
4444
end;
4545
/

‎source/core/types/ut_event_listener.tpb‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
create or replace type body ut_event_listener is
2+
3+
constructor function ut_event_listener(self in out nocopy ut_event_listener, a_reporters ut_reporters) return self as result is
4+
begin
5+
reporters := a_reporters;
6+
return;
7+
end;
8+
9+
overriding member procedure fire_before_event(self in out nocopy ut_event_listener, a_event_name varchar2, a_item ut_suite_item_base) is
10+
begin
11+
self.fire_event('before', a_event_name, a_item);
12+
end;
13+
14+
overriding member procedure fire_after_event(self in out nocopy ut_event_listener, a_event_name varchar2, a_item ut_suite_item_base) is
15+
begin
16+
self.fire_event('after', a_event_name, a_item);
17+
end;
18+
19+
overriding member procedure fire_event(self in out nocopy ut_event_listener, a_event_timing varchar2, a_event_name varchar2, a_item ut_suite_item_base) is
20+
l_method varchar2(250) := a_event_timing||'_calling_'||a_event_name;
21+
l_call_stmt varchar2(32767 byte);
22+
begin
23+
l_call_stmt :=
24+
'declare' ||
25+
' v_reporter ut_reporter := :a_reporter; ' ||
26+
'begin' ||
27+
' v_reporter.'||l_method||'( treat( :a_item as '||a_item.self_type||')); ' ||
28+
' :a_reporter := v_reporter; ' ||
29+
'end;';
30+
for i in 1..self.reporters.count loop
31+
execute immediate l_call_stmt using in out self.reporters(i), in treat(a_item as ut_suite_item);
32+
end loop;
33+
34+
end;
35+
36+
end;
37+
/

‎source/core/types/ut_event_listener.tps‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
create or replace type ut_event_listener under ut_event_listener_base
2+
(
3+
reporters ut_reporters,
4+
constructor function ut_event_listener(self in out nocopy ut_event_listener, a_reporters ut_reporters) return self as result,
5+
overriding member procedure fire_before_event(self in out nocopy ut_event_listener, a_event_name varchar2, a_item ut_suite_item_base),
6+
overriding member procedure fire_after_event(self in out nocopy ut_event_listener, a_event_name varchar2, a_item ut_suite_item_base),
7+
overriding member procedure fire_event(self in out nocopy ut_event_listener, a_event_timing varchar2, a_event_name varchar2, a_item ut_suite_item_base)
8+
)
9+
/

‎source/core/types/ut_event_listener_base.tps‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
create or replace type ut_event_listener_base as object
2+
(
3+
name varchar2(250),
4+
member procedure fire_before_event(self in out nocopy ut_event_listener_base, a_event_name varchar2, a_item ut_suite_item_base),
5+
member procedure fire_after_event(self in out nocopy ut_event_listener_base, a_event_name varchar2, a_item ut_suite_item_base),
6+
member procedure fire_event(self in out nocopy ut_event_listener_base, a_event_timing varchar2, a_event_name varchar2, a_item ut_suite_item_base)
7+
) not final not instantiable
8+
/

‎source/core/types/ut_executable.tpb‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ create or replace type body ut_executable is
4949
end is_valid;
5050

5151
member function form_name return varchar2 is
52-
begin
53-
return ut_metadata.form_name(owner_name, object_name, procedure_name);
54-
end;
52+
begin
53+
return ut_metadata.form_name(owner_name, object_name, procedure_name);
54+
end;
5555

56-
member procedure do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface) is
56+
member procedure do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) is
5757
l_completed_without_errors boolean;
5858
begin
5959
l_completed_without_errors := self.do_execute(a_item, a_listener);
6060
end do_execute;
6161

62-
member function do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface) return boolean is
62+
member function do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) return boolean is
6363
l_statement varchar2(4000);
6464
l_status number;
6565
l_cursor_number number;
@@ -71,17 +71,17 @@ create or replace type body ut_executable is
7171
l_error_backtrace varchar2(32767);
7272
l_completed_without_errors boolean := true;
7373

74-
function process_errors_from_call( a_error_stack varchar2, a_error_backtrace varchar2) return boolean is
74+
function process_errors_from_call(a_error_stack varchar2, a_error_backtrace varchar2) return boolean is
7575
l_errors_stack_trace varchar2(32767) := rtrim(a_error_stack||a_error_backtrace, chr(10));
76-
begin
77-
if l_errors_stack_trace is not null then
78-
ut_utils.debug_log('test method failed- ' ||l_errors_stack_trace );
79-
ut_assert_processor.report_error( l_errors_stack_trace );
80-
return false;
81-
else
82-
return true;
83-
end if;
84-
end;
76+
begin
77+
if l_errors_stack_trace is not null then
78+
ut_utils.debug_log('test method failed- ' ||l_errors_stack_trace );
79+
ut_assert_processor.report_error( l_errors_stack_trace );
80+
return false;
81+
else
82+
return true;
83+
end if;
84+
end;
8585
begin
8686
if self.is_defined() then
8787
--listener - before call to executable

‎source/core/types/ut_executable.tps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ create or replace type ut_executable force as object
1111
member function is_valid return boolean,
1212
member function is_defined return boolean,
1313
member function form_name return varchar2,
14-
member procedure do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface),
14+
member procedure do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base),
1515
/**
1616
* executes the defines executable
1717
* returns true if executed without exceptions
1818
* returns false if exceptions were raised
1919
*/
20-
member function do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_listener_interface) return boolean
20+
member function do_execute(self in ut_executable, a_item in out nocopy ut_suite_item, a_listener in out nocopy ut_event_listener_base) return boolean
2121
) final
2222
/

‎source/core/types/ut_execution_listener.tpb‎

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

0 commit comments

Comments
 (0)