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

Skip to content

Commit 6dcaae9

Browse files
jgebaljgebal
committed
Merge remote-tracking branch 'upstream/develop' into feature/annotations_restructuring
2 parents b83e142 + a3a0dc7 commit 6dcaae9

35 files changed

Lines changed: 814 additions & 1506 deletions

‎source/api/ut.pkb‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -24,69 +24,69 @@ create or replace package body ut is
2424
return ut_runner.version();
2525
end;
2626

27-
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_anydata is
27+
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation is
2828
begin
29-
return ut_expectation_anydata(ut_data_value_anydata.get_instance(a_actual), a_message);
29+
return ut_expectation(ut_data_value_anydata.get_instance(a_actual), a_message);
3030
end;
3131

32-
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation_blob is
32+
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation is
3333
begin
34-
return ut_expectation_blob(ut_data_value_blob(a_actual), a_message);
34+
return ut_expectation(ut_data_value_blob(a_actual), a_message);
3535
end;
3636

37-
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation_boolean is
37+
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation is
3838
begin
39-
return ut_expectation_boolean(ut_data_value_boolean(a_actual), a_message);
39+
return ut_expectation(ut_data_value_boolean(a_actual), a_message);
4040
end;
4141

42-
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation_clob is
42+
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation is
4343
begin
44-
return ut_expectation_clob(ut_data_value_clob(a_actual), a_message);
44+
return ut_expectation(ut_data_value_clob(a_actual), a_message);
4545
end;
4646

47-
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation_date is
47+
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation is
4848
begin
49-
return ut_expectation_date(ut_data_value_date(a_actual), a_message);
49+
return ut_expectation(ut_data_value_date(a_actual), a_message);
5050
end;
5151

52-
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation_number is
52+
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation is
5353
begin
54-
return ut_expectation_number(ut_data_value_number(a_actual), a_message);
54+
return ut_expectation(ut_data_value_number(a_actual), a_message);
5555
end;
5656

57-
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp is
57+
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation is
5858
begin
59-
return ut_expectation_timestamp(ut_data_value_timestamp(a_actual), a_message);
59+
return ut_expectation(ut_data_value_timestamp(a_actual), a_message);
6060
end;
6161

62-
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_ltz is
62+
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation is
6363
begin
64-
return ut_expectation_timestamp_ltz(ut_data_value_timestamp_ltz(a_actual), a_message);
64+
return ut_expectation(ut_data_value_timestamp_ltz(a_actual), a_message);
6565
end;
6666

67-
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_tz is
67+
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation is
6868
begin
69-
return ut_expectation_timestamp_tz(ut_data_value_timestamp_tz(a_actual), a_message);
69+
return ut_expectation(ut_data_value_timestamp_tz(a_actual), a_message);
7070
end;
7171

72-
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation_varchar2 is
72+
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation is
7373
begin
74-
return ut_expectation_varchar2(ut_data_value_varchar2(a_actual), a_message);
74+
return ut_expectation(ut_data_value_varchar2(a_actual), a_message);
7575
end;
7676

77-
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor is
77+
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation is
7878
begin
79-
return ut_expectation_refcursor(ut_data_value_refcursor(a_actual), a_message);
79+
return ut_expectation(ut_data_value_refcursor(a_actual), a_message);
8080
end;
8181

82-
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation_yminterval is
82+
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation is
8383
begin
84-
return ut_expectation_yminterval(ut_data_value_yminterval(a_actual), a_message);
84+
return ut_expectation(ut_data_value_yminterval(a_actual), a_message);
8585
end;
8686

87-
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation_dsinterval is
87+
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation is
8888
begin
89-
return ut_expectation_dsinterval(ut_data_value_dsinterval(a_actual), a_message);
89+
return ut_expectation(ut_data_value_dsinterval(a_actual), a_message);
9090
end;
9191

9292
procedure fail(a_message in varchar2) is
@@ -259,55 +259,55 @@ create or replace package body ut is
259259
end;
260260

261261
procedure run(
262-
a_reporter ut_reporter_base := null, a_color_console boolean := false,
262+
a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false,
263263
a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
264264
a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
265265
) is
266+
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
266267
begin
267-
ut.run(
268-
ut_varchar2_list(sys_context('userenv', 'current_schema')), a_reporter, a_color_console,
269-
a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
268+
run_autonomous(
269+
a_paths, l_reporter, ut_utils.boolean_to_int(a_color_console), a_coverage_schemes, a_source_file_mappings, a_test_file_mappings,
270+
a_include_objects, a_exclude_objects
270271
);
272+
ut_output_buffer.lines_to_dbms_output(l_reporter.reporter_id);
271273
end;
272274

273275
procedure run(
274-
a_reporter ut_reporter_base := null, a_color_console boolean := false,
276+
a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false,
275277
a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
276278
a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
277279
) is
280+
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
278281
begin
279-
ut.run(
280-
ut_varchar2_list(sys_context('userenv', 'current_schema')), a_reporter, a_color_console,
281-
a_coverage_schemes, a_source_files, a_test_files, a_include_objects, a_exclude_objects
282+
run_autonomous(
283+
a_paths, l_reporter, ut_utils.boolean_to_int(a_color_console), a_coverage_schemes, a_source_files, a_test_files,
284+
a_include_objects, a_exclude_objects
282285
);
286+
ut_output_buffer.lines_to_dbms_output(l_reporter.reporter_id);
283287
end;
284288

285289
procedure run(
286-
a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false,
290+
a_reporter ut_reporter_base := null, a_color_console boolean := false,
287291
a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
288292
a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
289293
) is
290-
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
291294
begin
292-
ut_runner.run(
293-
a_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings,
294-
a_include_objects, a_exclude_objects
295+
ut.run(
296+
ut_varchar2_list(sys_context('userenv', 'current_schema')), a_reporter, a_color_console,
297+
a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects
295298
);
296-
ut_output_buffer.lines_to_dbms_output(l_reporter.reporter_id);
297299
end;
298300

299301
procedure run(
300-
a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false,
302+
a_reporter ut_reporter_base := null, a_color_console boolean := false,
301303
a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list,
302304
a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null
303305
) is
304-
l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter());
305306
begin
306-
ut_runner.run(
307-
a_paths, l_reporter, a_color_console, a_coverage_schemes, a_source_files, a_test_files,
308-
a_include_objects, a_exclude_objects
307+
ut.run(
308+
ut_varchar2_list(sys_context('userenv', 'current_schema')), a_reporter, a_color_console,
309+
a_coverage_schemes, a_source_files, a_test_files, a_include_objects, a_exclude_objects
309310
);
310-
ut_output_buffer.lines_to_dbms_output(l_reporter.reporter_id);
311311
end;
312312

313313
procedure run(

‎source/api/ut.pks‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ create or replace package ut authid current_user as
1919

2020
function version return varchar2;
2121

22-
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_anydata;
22+
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation;
2323

24-
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation_blob;
24+
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation;
2525

26-
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation_boolean;
26+
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation;
2727

28-
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation_clob;
28+
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation;
2929

30-
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation_date;
30+
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation;
3131

32-
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation_number;
32+
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation;
3333

34-
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor;
34+
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation;
3535

36-
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp;
36+
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation;
3737

38-
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_ltz;
38+
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation;
3939

40-
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_tz;
40+
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation;
4141

42-
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation_varchar2;
42+
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation;
4343

44-
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation_yminterval;
44+
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation;
4545

46-
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation_dsinterval;
46+
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation;
4747

4848
procedure fail(a_message in varchar2);
4949

‎source/api/ut_runner.pkb‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ create or replace package body ut_runner is
3333
return l_result;
3434
end;
3535

36+
procedure finish_run(a_reporters ut_reporters) is
37+
begin
38+
ut_utils.cleanup_temp_tables;
39+
ut_output_buffer.close(a_reporters);
40+
ut_metadata.reset_source_definition_cache;
41+
ut_utils.read_cache_to_dbms_output();
42+
end;
3643

3744

3845
/**
@@ -61,8 +68,8 @@ create or replace package body ut_runner is
6168
a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,
6269
a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false
6370
) is
64-
l_items_to_run ut_run;
65-
l_listener ut_event_listener;
71+
l_items_to_run ut_run;
72+
l_listener ut_event_listener;
6673
begin
6774
begin
6875
ut_output_buffer.cleanup_buffer();
@@ -85,16 +92,10 @@ create or replace package body ut_runner is
8592
);
8693
l_items_to_run.do_execute(l_listener);
8794

88-
ut_utils.cleanup_temp_tables;
89-
ut_output_buffer.close(l_listener.reporters);
90-
ut_metadata.reset_source_definition_cache;
91-
ut_utils.read_cache_to_dbms_output();
92-
exception
95+
finish_run(l_listener.reporters);
96+
exception
9397
when others then
94-
ut_utils.cleanup_temp_tables;
95-
ut_output_buffer.close(l_listener.reporters);
96-
ut_metadata.reset_source_definition_cache;
97-
ut_utils.read_cache_to_dbms_output();
98+
finish_run(l_listener.reporters);
9899
dbms_output.put_line(dbms_utility.format_error_backtrace);
99100
dbms_output.put_line(dbms_utility.format_error_stack);
100101
raise;

0 commit comments

Comments
 (0)