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

Skip to content

Commit aa80170

Browse files
ShoelaceShoelace
committed
rename execute function to do_execute
1 parent 59e9d1a commit aa80170

32 files changed

Lines changed: 83 additions & 83 deletions

‎source/core/types/ut_executable.tpb‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
11
create or replace type body ut_executable is
22

33
static procedure execute_call(a_owner varchar2, a_object varchar2, a_procedure_name varchar2) is
4-
stmt varchar2(200);
5-
i number;
6-
c number;
4+
l_stmt varchar2(200);
5+
l_cursorid number;
6+
l_rowsprocessed number;
77

8-
owner varchar2(200) := a_owner;
9-
object_name varchar2(200) := a_object;
10-
procedure_name varchar2(200) := a_procedure_name;
8+
l_owner varchar2(200) := a_owner;
9+
l_object_name varchar2(200) := a_object;
10+
l_procedure_name varchar2(200) := a_procedure_name;
1111

1212
begin
1313

14-
ut_metadata.do_resolve(a_owner => owner, a_object => object_name, a_procedure_name => procedure_name);
14+
ut_metadata.do_resolve(a_owner => l_owner, a_object => l_object_name, a_procedure_name => l_procedure_name);
1515

16-
stmt := 'begin ' || ut_metadata.form_name(owner, object_name, procedure_name) || '; end;';
16+
l_stmt := 'begin ' || ut_metadata.form_name(l_owner, l_object_name, l_procedure_name) || '; end;';
1717

18-
ut_utils.debug_log('ut_executable.execute_call stmt:' || stmt);
18+
ut_utils.debug_log('ut_executable.execute_call stmt:' || l_stmt);
1919

20-
i := dbms_sql.open_cursor;
21-
dbms_sql.parse(c => i, statement => stmt, language_flag => dbms_sql.native);
22-
c := dbms_sql.execute(i);
23-
dbms_sql.close_cursor(i);
20+
l_cursorid := dbms_sql.open_cursor;
21+
dbms_sql.parse(c => l_cursorid, statement => l_stmt, language_flag => dbms_sql.native);
22+
l_rowsprocessed := dbms_sql.execute(l_cursorid);
23+
dbms_sql.close_cursor(l_cursorid);
2424
exception
2525
when others then
26-
if i is not null and dbms_sql.is_open(i) then
27-
dbms_sql.close_cursor(i);
26+
if l_cursorid is not null and dbms_sql.is_open(l_cursorid) then
27+
dbms_sql.close_cursor(l_cursorid);
2828
end if;
2929
raise;
3030
end;
3131

3232
member function is_valid(a_proc_type varchar2) return boolean is
33-
a_result boolean := true;
33+
l_result boolean := true;
3434
begin
3535

3636
if self.object_name is null then
37-
a_result := false;
37+
l_result := false;
3838
ut_assert_processor.report_error('Call params for ' || a_proc_type || ' are not valid: package is not defined');
3939
end if;
4040

4141
if self.procedure_name is null then
42-
a_result := false;
42+
l_result := false;
4343
ut_assert_processor.report_error('Call params for ' || a_proc_type || ' are not valid: procedure is not defined');
4444
end if;
4545

46-
if a_result and not ut_metadata.package_valid(self.owner_name, self.object_name) then
47-
a_result := false;
46+
if l_result and not ut_metadata.package_valid(self.owner_name, self.object_name) then
47+
l_result := false;
4848
ut_assert_processor.report_error('Call params for ' || a_proc_type ||
4949
' are not valid: package does not exist or is invalid: ' ||
5050
nvl(self.object_name, '<missing package name>'));
5151
end if;
5252

53-
if a_result and not ut_metadata.procedure_exists(self.owner_name, self.object_name, self.procedure_name) then
54-
a_result := false;
53+
if l_result and not ut_metadata.procedure_exists(self.owner_name, self.object_name, self.procedure_name) then
54+
l_result := false;
5555
ut_assert_processor.report_error('Call params for ' || a_proc_type || ' are not valid: package missing ' || a_proc_type ||
5656
' procedure ' || self.object_name || '.' ||
5757
nvl(self.procedure_name, '<missing procedure name>'));
5858
end if;
5959

60-
return a_result;
60+
return l_result;
6161
end is_valid;
6262

6363
member function form_name return varchar2 is
6464
begin
6565
return ut_metadata.form_name(owner_name, object_name, procedure_name);
6666
end;
6767

68-
member procedure execute(self in ut_executable) is
68+
member procedure do_execute(self in ut_executable) is
6969
begin
7070
ut_executable.execute_call(self.owner_name, self.object_name, self.procedure_name);
71-
end execute;
71+
end do_execute;
7272

7373
end;
7474
/

‎source/core/types/ut_executable.tps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ create or replace type ut_executable force as object
77
static procedure execute_call(a_owner varchar2, a_object varchar2, a_procedure_name varchar2),
88
member function is_valid(a_proc_type varchar2) return boolean,
99
member function form_name return varchar2,
10-
member procedure execute(self in ut_executable)
10+
member procedure do_execute(self in ut_executable)
1111
) final
1212
/

‎source/core/types/ut_test.tpb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
create or replace type body ut_test is
22

3-
constructor function ut_test(a_object_name varchar2, a_test_procedure varchar2, a_test_name in varchar2 default null, a_owner_name varchar2 default null, a_setup_procedure varchar2 default null, a_teardown_procedure varchar2 default null, a_rollback_type integer default null)
3+
constructor function ut_test(self in out nocopy ut_test,a_object_name varchar2, a_test_procedure varchar2, a_test_name in varchar2 default null, a_owner_name varchar2 default null, a_setup_procedure varchar2 default null, a_teardown_procedure varchar2 default null, a_rollback_type integer default null)
44
return self as result is
55
begin
66
self.name := a_test_name;
@@ -37,12 +37,12 @@ create or replace type body ut_test is
3737
teardown.is_valid('teardown'));
3838
end is_valid;
3939

40-
overriding member procedure execute(self in out nocopy ut_test, a_reporter ut_reporter) is
40+
overriding member procedure do_execute(self in out nocopy ut_test, a_reporter ut_reporter) is
4141
l_reporter ut_reporter := a_reporter;
4242
begin
43-
l_reporter := execute(l_reporter);
43+
l_reporter := do_execute(l_reporter);
4444
end;
45-
overriding member function execute(self in out nocopy ut_test, a_reporter ut_reporter) return ut_reporter is
45+
overriding member function do_execute(self in out nocopy ut_test, a_reporter ut_reporter) return ut_reporter is
4646
l_reporter ut_reporter := a_reporter;
4747
l_savepoint varchar2(30);
4848
begin
@@ -64,13 +64,13 @@ create or replace type body ut_test is
6464

6565
if self.setup is not null then
6666
l_reporter.before_test_setup(self);
67-
self.setup.execute;
67+
self.setup.do_execute;
6868
l_reporter.after_test_setup(self);
6969
end if;
7070

7171
l_reporter.before_test_execute(self);
7272
begin
73-
self.test.execute;
73+
self.test.do_execute;
7474
exception
7575
when others then
7676
-- dbms_utility.format_error_backtrace is 10g or later
@@ -84,7 +84,7 @@ create or replace type body ut_test is
8484

8585
if self.teardown is not null then
8686
l_reporter.before_test_teardown(self);
87-
self.teardown.execute;
87+
self.teardown.do_execute;
8888
l_reporter.after_test_teardown(self);
8989
end if;
9090

@@ -128,11 +128,11 @@ create or replace type body ut_test is
128128
return l_reporter;
129129
end;
130130

131-
overriding member procedure execute(self in out nocopy ut_test) is
131+
overriding member procedure do_execute(self in out nocopy ut_test) is
132132
l_null_reporter ut_reporter := ut_reporter();
133133
begin
134-
self.execute(l_null_reporter);
135-
end execute;
134+
self.do_execute(l_null_reporter);
135+
end do_execute;
136136

137137
end;
138138
/

‎source/core/types/ut_test.tps‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ create or replace type ut_test force under ut_test_object
44
test ut_executable,
55
teardown ut_executable,
66

7-
constructor function ut_test(a_object_name varchar2, a_test_procedure varchar2, a_test_name in varchar2 default null, a_owner_name varchar2 default null, a_setup_procedure varchar2 default null, a_teardown_procedure varchar2 default null, a_rollback_type integer default null)
7+
constructor function ut_test(self in out nocopy ut_test,a_object_name varchar2, a_test_procedure varchar2, a_test_name in varchar2 default null, a_owner_name varchar2 default null, a_setup_procedure varchar2 default null, a_teardown_procedure varchar2 default null, a_rollback_type integer default null)
88
return self as result,
99

1010
member function is_valid return boolean,
1111

12-
overriding member procedure execute(self in out nocopy ut_test, a_reporter ut_reporter),
13-
overriding member function execute(self in out nocopy ut_test, a_reporter ut_reporter) return ut_reporter,
14-
overriding member procedure execute(self in out nocopy ut_test)
12+
overriding member procedure do_execute(self in out nocopy ut_test, a_reporter ut_reporter),
13+
overriding member function do_execute(self in out nocopy ut_test, a_reporter ut_reporter) return ut_reporter,
14+
overriding member procedure do_execute(self in out nocopy ut_test)
1515

1616
)
1717
not final

‎source/core/types/ut_test_object.tps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ create or replace type ut_test_object force under ut_composite_object
66
rollback_type integer(1), -- ut_utils:gc_rollback_% constants
77
ignore_flag integer(1),
88

9-
not instantiable member procedure execute(self in out nocopy ut_test_object, a_reporter ut_reporter),
10-
not instantiable member function execute(self in out nocopy ut_test_object, a_reporter ut_reporter)
9+
not instantiable member procedure do_execute(self in out nocopy ut_test_object, a_reporter ut_reporter),
10+
not instantiable member function do_execute(self in out nocopy ut_test_object, a_reporter ut_reporter)
1111
return ut_reporter,
12-
not instantiable member procedure execute(self in out nocopy ut_test_object),
12+
not instantiable member procedure do_execute(self in out nocopy ut_test_object),
1313

1414
member procedure set_ignore_flag(self in out nocopy ut_test_object, a_ignore_flag boolean),
1515
member procedure set_rollback_type(self in out nocopy ut_test_object, a_rollback_type integer)

‎source/core/types/ut_test_suite.tpb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
create or replace type body ut_test_suite is
22

3-
constructor function ut_test_suite(a_suite_name varchar2, a_object_name varchar2 default null, a_items ut_objects_list default ut_objects_list(), a_rollback_type number default null)
3+
constructor function ut_test_suite(self in out nocopy ut_test_suite,a_suite_name varchar2, a_object_name varchar2 default null, a_items ut_objects_list default ut_objects_list(), a_rollback_type number default null)
44
return self as result is
55
begin
66
self.name := a_suite_name;
@@ -41,13 +41,13 @@ create or replace type body ut_test_suite is
4141
return l_is_valid;
4242
end is_valid;
4343

44-
overriding member procedure execute(self in out nocopy ut_test_suite, a_reporter ut_reporter) is
44+
overriding member procedure do_execute(self in out nocopy ut_test_suite, a_reporter ut_reporter) is
4545
l_reporter ut_reporter := a_reporter;
4646
begin
47-
l_reporter := execute(l_reporter);
47+
l_reporter := do_execute(l_reporter);
4848
end;
4949

50-
overriding member function execute(self in out nocopy ut_test_suite, a_reporter ut_reporter)
50+
overriding member function do_execute(self in out nocopy ut_test_suite, a_reporter ut_reporter)
5151
return ut_reporter is
5252
l_reporter ut_reporter := a_reporter;
5353
l_test_object ut_test_object;
@@ -70,23 +70,23 @@ create or replace type body ut_test_suite is
7070

7171
if self.setup is not null then
7272
l_reporter.before_suite_setup(self);
73-
self.setup.execute;
73+
self.setup.do_execute;
7474
l_reporter.after_suite_setup(self);
7575
end if;
7676

7777
for i in self.items.first .. self.items.last loop
7878
l_reporter.before_suite_item(a_suite => self,a_item_index => i);
7979

8080
l_test_object := treat(self.items(i) as ut_test_object);
81-
l_reporter := l_test_object.execute(a_reporter => l_reporter);
81+
l_reporter := l_test_object.do_execute(a_reporter => l_reporter);
8282
self.items(i) := l_test_object;
8383

8484
l_reporter.after_suite_item(a_suite => self,a_item_index => i);
8585
end loop;
8686

8787
if self.teardown is not null then
8888
l_reporter.before_suite_teardown(self);
89-
self.teardown.execute;
89+
self.teardown.do_execute;
9090
l_reporter.after_suite_teardown(self);
9191
end if;
9292

@@ -105,10 +105,10 @@ create or replace type body ut_test_suite is
105105
return l_reporter;
106106
end;
107107

108-
overriding member procedure execute(self in out nocopy ut_test_suite) is
108+
overriding member procedure do_execute(self in out nocopy ut_test_suite) is
109109
l_null_reporter ut_reporter := ut_reporter();
110110
begin
111-
self.execute(l_null_reporter);
111+
self.do_execute(l_null_reporter);
112112
end;
113113

114114
end;

‎source/core/types/ut_test_suite.tps‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ create or replace type ut_test_suite force under ut_test_object
44
setup ut_executable,
55
teardown ut_executable,
66

7-
constructor function ut_test_suite(a_suite_name varchar2, a_object_name varchar2 default null, a_items ut_objects_list default ut_objects_list(), a_rollback_type number default null)
7+
constructor function ut_test_suite(self in out nocopy ut_test_suite,a_suite_name varchar2, a_object_name varchar2 default null, a_items ut_objects_list default ut_objects_list(), a_rollback_type number default null)
88
return self as result,
99

10-
member procedure set_suite_setup(self in out nocopy ut_test_suite, a_object_name in varchar2, a_proc_name in varchar2, a_owner_name varchar2 default null),
10+
member procedure set_suite_setup (self in out nocopy ut_test_suite, a_object_name in varchar2, a_proc_name in varchar2, a_owner_name varchar2 default null),
1111

1212
member procedure set_suite_teardown(self in out nocopy ut_test_suite, a_object_name in varchar2, a_proc_name in varchar2, a_owner_name varchar2 default null),
1313
member function is_valid return boolean,
1414

15-
overriding member procedure execute(self in out nocopy ut_test_suite, a_reporter ut_reporter),
16-
overriding member function execute(self in out nocopy ut_test_suite, a_reporter ut_reporter)
15+
overriding member procedure do_execute(self in out nocopy ut_test_suite, a_reporter ut_reporter),
16+
overriding member function do_execute(self in out nocopy ut_test_suite, a_reporter ut_reporter)
1717
return ut_reporter,
18-
overriding member procedure execute(self in out nocopy ut_test_suite)
18+
overriding member procedure do_execute(self in out nocopy ut_test_suite)
1919
)
2020
not final
2121
/

‎source/core/ut_assert_processor.pkb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ create or replace package body ut_assert_processor as
8080
begin
8181
g_session_params := get_session_parameters();
8282

83-
execute immediate q'[alter session set events '19119 trace name context forever, level 0x8']';
83+
--execute immediate q'[alter session set events '19119 trace name context forever, level 0x8']';
8484

8585
execute immediate 'alter session set nls_date_format = '''||ut_utils.gc_date_format||'''';
8686
execute immediate 'alter session set nls_timestamp_format = '''||ut_utils.gc_timestamp_format||'''';
@@ -89,7 +89,7 @@ create or replace package body ut_assert_processor as
8989

9090
procedure reset_nls_params is
9191
begin
92-
execute immediate q'[alter session set events '19119 trace name context off']';
92+
--execute immediate q'[alter session set events '19119 trace name context off']';
9393

9494
if g_session_params is not null then
9595
for i in 1 .. g_session_params.count loop

‎source/core/ut_suite_manager.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ create or replace package body ut_suite_manager is
290290
l_ind := g_schema_suites(a_owner_name).first;
291291
while l_ind is not null loop
292292
l_suite := g_schema_suites(a_owner_name) (l_ind);
293-
l_suite.execute(a_reporter => a_reporter);
293+
l_suite.do_execute(a_reporter => a_reporter);
294294
g_schema_suites(a_owner_name)(l_ind) := l_suite;
295295
l_ind := g_schema_suites(a_owner_name).next(l_ind);
296296
end loop;

‎tests/ut_test/ut_test.IgnoreFlagSkipTest.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ begin
1818
l_suite := ut_test_suite(a_suite_name => 'Suite name', a_object_name => 'UT_TRANSACTION_CONTROL', a_items => ut_objects_list(l_test), a_rollback_type => ut_utils.gc_rollback_auto);
1919

2020
--Act
21-
l_suite.execute;
21+
l_suite.do_execute;
2222

2323
ut_assert_processor.clear_asserts;
2424

0 commit comments

Comments
 (0)