Skip to content

Commit b47cc17

Browse files
PazusPazus
authored
Merge branch 'develop' into feature/sonar_test_reporter
2 parents be014a0 + 8e859bb commit b47cc17

File tree

119 files changed

+495
-583
lines changed

Some content is hidden

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

119 files changed

+495
-583
lines changed

‎examples/demo_expectations.pck‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
create or replace package demo_expectations is
22

33
-- %suite
4-
-- %displayname(Demoing asserts)
4+
-- %displayname(Demoing expectations)
55

66
-- %test
77
-- %displayname(demo of expectations with nulls)

‎examples/developer_examples/RunExampleTestSuite.sql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ declare
1414
suite ut_logical_suite;
1515
listener ut_event_listener := ut_event_listener(ut_reporters());
1616
test_item ut_test;
17-
assert ut_assert_result;
17+
expectation ut_expectation_result;
1818
begin
1919
suite := ut_logical_suite(a_object_owner=>null, a_object_name => 'ut_exampletest', a_name => null, a_description => 'Test Suite Name',a_path => null);
2020

@@ -43,11 +43,11 @@ begin
4343
dbms_output.put_line('---------------------------------------------------');
4444
dbms_output.put_line('Test:' || test_item.item.form_name);
4545
dbms_output.put_line('Result: ' || ut_utils.test_result_to_char(test_item.result));
46-
dbms_output.put_line('Assert Results:');
46+
dbms_output.put_line('expectation Results:');
4747
for i in test_item.results.first .. test_item.results.last loop
48-
assert := test_item.results(i);
49-
dbms_output.put_line(i || ' - result: ' || ut_utils.test_result_to_char(assert.result));
50-
dbms_output.put_line(i || ' - Message: ' || assert.message);
48+
expectation := test_item.results(i);
49+
dbms_output.put_line(i || ' - result: ' || ut_utils.test_result_to_char(expectation.result));
50+
dbms_output.put_line(i || ' - Message: ' || expectation.message);
5151
end loop;
5252
end loop;
5353
dbms_output.put_line('---------------------------------------------------');

‎source/api/ut.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ create or replace package body ut is
8989

9090
procedure fail(a_message in varchar2) is
9191
begin
92-
ut_assert_processor.report_failure(a_message);
92+
ut_expectation_processor.report_failure(a_message);
9393
end;
9494

9595
procedure run_autonomous(a_paths ut_varchar2_list, a_reporter ut_reporter_base, a_color_console integer) is

source/core/types/ut_assert_result.tpb renamed to source/core/types/ut_expectation_result.tpb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace type body ut_assert_result is
1+
create or replace type body ut_expectation_result is
22
/*
33
utPLSQL - Version X.X.X.X
44
Copyright 2016 - 2017 utPLSQL Project
@@ -16,16 +16,16 @@ create or replace type body ut_assert_result is
1616
limitations under the License.
1717
*/
1818

19-
constructor function ut_assert_result(self in out nocopy ut_assert_result, a_result integer, a_error_message varchar2)
19+
constructor function ut_expectation_result(self in out nocopy ut_expectation_result, a_result integer, a_error_message varchar2)
2020
return self as result is
2121
begin
2222
self.result := a_result;
2323
self.error_message := a_error_message;
24-
self.caller_info := ut_assert_processor.who_called_expectation();
24+
self.caller_info := ut_expectation_processor.who_called_expectation();
2525
return;
2626
end;
2727

28-
constructor function ut_assert_result(self in out nocopy ut_assert_result, a_name varchar2, a_additional_info varchar2, a_error_message varchar2, a_result integer, a_expected_type varchar2, a_actual_type varchar2,
28+
constructor function ut_expectation_result(self in out nocopy ut_expectation_result, a_name varchar2, a_additional_info varchar2, a_error_message varchar2, a_result integer, a_expected_type varchar2, a_actual_type varchar2,
2929
a_expected_value_string varchar2, a_actual_value_string varchar2, a_message varchar2 default null)
3030
return self as result is
3131
begin
@@ -39,12 +39,12 @@ create or replace type body ut_assert_result is
3939
self.expected_value_string := a_expected_value_string;
4040
self.actual_value_string := a_actual_value_string;
4141
if a_result = ut_utils.tr_failure then
42-
self.caller_info := ut_assert_processor.who_called_expectation();
42+
self.caller_info := ut_expectation_processor.who_called_expectation();
4343
end if;
4444
return;
4545
end;
4646

47-
member function get_result_clob(self in ut_assert_result) return clob is
47+
member function get_result_clob(self in ut_expectation_result) return clob is
4848
l_result clob;
4949
l_actual_val_msg varchar2(1000);
5050
l_actual_val varchar2(32767);
@@ -98,7 +98,7 @@ create or replace type body ut_assert_result is
9898
return l_result;
9999
end;
100100

101-
member function get_result_lines(self in ut_assert_result) return ut_varchar2_list is
101+
member function get_result_lines(self in ut_expectation_result) return ut_varchar2_list is
102102
begin
103103
return ut_utils.clob_to_table(get_result_clob(), 4000 );
104104
end;

source/core/types/ut_assert_result.tps renamed to source/core/types/ut_expectation_result.tps

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace type ut_assert_result as object(
1+
create or replace type ut_expectation_result as object(
22
/*
33
utPLSQL - Version X.X.X.X
44
Copyright 2016 - 2017 utPLSQL Project
@@ -56,14 +56,14 @@ create or replace type ut_assert_result as object(
5656
* The information about the line of code that invoked the expectation
5757
*/
5858
caller_info varchar2(4000 char),
59-
constructor function ut_assert_result(self in out nocopy ut_assert_result, a_result integer, a_error_message varchar2)
59+
constructor function ut_expectation_result(self in out nocopy ut_expectation_result, a_result integer, a_error_message varchar2)
6060
return self as result,
61-
constructor function ut_assert_result(self in out nocopy ut_assert_result, a_name varchar2, a_additional_info varchar2, a_error_message varchar2,
61+
constructor function ut_expectation_result(self in out nocopy ut_expectation_result, a_name varchar2, a_additional_info varchar2, a_error_message varchar2,
6262
a_result integer, a_expected_type varchar2, a_actual_type varchar2,
6363
a_expected_value_string varchar2, a_actual_value_string varchar2, a_message varchar2 default null)
6464
return self as result,
65-
member function get_result_clob(self in ut_assert_result) return clob,
66-
member function get_result_lines(self in ut_assert_result) return ut_varchar2_list
65+
member function get_result_clob(self in ut_expectation_result) return clob,
66+
member function get_result_lines(self in ut_expectation_result) return ut_varchar2_list
6767
)
6868
not final
6969
/

source/core/types/ut_assert_results.tps renamed to source/core/types/ut_expectation_results.tps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace type ut_assert_results as
1+
create or replace type ut_expectation_results as
22
/*
33
utPLSQL - Version X.X.X.X
44
Copyright 2016 - 2017 utPLSQL Project
@@ -15,5 +15,5 @@ create or replace type ut_assert_results as
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
*/
18-
table of ut_assert_result
18+
table of ut_expectation_result
1919
/

‎source/core/types/ut_run.tpb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ create or replace type body ut_run as
3535
self.start_time := current_timestamp;
3636

3737
-- clear anything that might stay in the session's cache
38-
ut_assert_processor.clear_asserts;
38+
ut_expectation_processor.clear_expectations;
3939

4040
for i in 1 .. self.items.count loop
4141
l_completed_without_errors := self.items(i).do_execute(a_listener);
@@ -118,17 +118,17 @@ create or replace type body ut_run as
118118
return l_schemes;
119119

120120
end;
121-
121+
122122
overriding member function get_error_stack_traces return ut_varchar2_list is
123123
begin
124124
return ut_varchar2_list();
125125
end;
126-
126+
127127
overriding member function get_serveroutputs return clob is
128128
begin
129129
return null;
130130
end;
131131

132-
132+
133133
end;
134134
/

‎source/core/types/ut_test.tpb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ create or replace type body ut_test as
9494
overriding member procedure calc_execution_result(self in out nocopy ut_test) is
9595
begin
9696
if self.get_error_stack_traces().count = 0 then
97-
self.result := ut_assert_processor.get_aggregate_asserts_result();
97+
self.result := ut_expectation_processor.get_status();
9898
else
9999
self.result := ut_utils.tr_error;
100100
end if;
101101
--expectation results need to be part of test results
102-
self.results := ut_assert_processor.get_asserts_results();
102+
self.results := ut_expectation_processor.get_expectations_results();
103103
self.results_count := ut_results_counter(self.result);
104104
end;
105105

‎source/core/types/ut_test.tps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ create or replace type ut_test under ut_suite_item (
4040
*/
4141
after_each ut_executable,
4242
/**
43-
* The list of assert results as well as database errors encountered while invoking
43+
* The list of expectation results as well as database errors encountered while invoking
4444
* The test procedure and the before_test/after_test blocks
4545
*/
46-
results ut_assert_results,
46+
results ut_expectation_results,
4747
parent_error_stack_trace varchar2(4000),
4848
constructor function ut_test(
4949
self in out nocopy ut_test, a_object_owner varchar2 := null, a_object_name varchar2, a_name varchar2, a_description varchar2 := null,

source/core/ut_assert_processor.pkb renamed to source/core/ut_expectation_processor.pkb

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
create or replace package body ut_assert_processor as
1+
create or replace package body ut_expectation_processor as
22
/*
33
utPLSQL - Version X.X.X.X
44
Copyright 2016 - 2017 utPLSQL Project
@@ -20,7 +20,7 @@ create or replace package body ut_assert_processor as
2020

2121
g_session_params tt_nls_params;
2222

23-
g_asserts_called ut_assert_results := ut_assert_results();
23+
g_expectations_called ut_expectation_results := ut_expectation_results();
2424

2525
g_nulls_are_equal boolean_not_null := gc_default_nulls_are_equal;
2626

@@ -34,44 +34,43 @@ create or replace package body ut_assert_processor as
3434
g_nulls_are_equal := a_setting;
3535
end;
3636

37-
function get_aggregate_asserts_result return integer is
37+
function get_status return integer is
3838
l_result integer := ut_utils.tr_success;
3939
begin
40-
ut_utils.debug_log('ut_assert_processor.get_aggregate_asserts_result');
40+
ut_utils.debug_log('ut_expectation_processor.get_status');
4141

42-
for i in 1 .. g_asserts_called.count loop
43-
l_result := greatest(l_result, g_asserts_called(i).result);
42+
for i in 1 .. g_expectations_called.count loop
43+
l_result := greatest(l_result, g_expectations_called(i).result);
4444
exit when l_result = ut_utils.tr_error;
4545
end loop;
4646
return l_result;
47+
end get_status;
4748

48-
end get_aggregate_asserts_result;
49-
50-
procedure clear_asserts is
49+
procedure clear_expectations is
5150
begin
52-
ut_utils.debug_log('ut_assert_processor.clear_asserts');
53-
g_asserts_called.delete;
51+
ut_utils.debug_log('ut_expectation_processor.clear_expectations');
52+
g_expectations_called.delete;
5453
end;
5554

56-
function get_asserts_results return ut_assert_results is
57-
l_asserts_results ut_assert_results := ut_assert_results();
55+
function get_expectations_results return ut_expectation_results is
56+
l_expectations_results ut_expectation_results := ut_expectation_results();
5857
begin
59-
ut_utils.debug_log('ut_assert_processor.get_asserts_results: .count='||g_asserts_called.count);
60-
l_asserts_results := g_asserts_called;
61-
clear_asserts();
62-
return l_asserts_results;
63-
end get_asserts_results;
58+
ut_utils.debug_log('ut_expectation_processor.get_expectations_results: .count='||g_expectations_called.count);
59+
l_expectations_results := g_expectations_called;
60+
clear_expectations();
61+
return l_expectations_results;
62+
end get_expectations_results;
6463

65-
procedure add_assert_result(a_assert_result ut_assert_result) is
64+
procedure add_expectation_result(a_expectation_result ut_expectation_result) is
6665
begin
67-
ut_utils.debug_log('ut_assert_processor.add_assert_result');
68-
g_asserts_called.extend;
69-
g_asserts_called(g_asserts_called.last) := a_assert_result;
66+
ut_utils.debug_log('ut_expectation_processor.add_expectation_result');
67+
g_expectations_called.extend;
68+
g_expectations_called(g_expectations_called.last) := a_expectation_result;
7069
end;
7170

7271
procedure report_failure(a_message in varchar2) is
7372
begin
74-
add_assert_result(ut_assert_result(ut_utils.tr_failure, a_message));
73+
add_expectation_result(ut_expectation_result(ut_utils.tr_failure, a_message));
7574
end;
7675

7776
function get_session_parameters return tt_nls_params is

0 commit comments

Comments
 (0)